diff options
| author | Micky Ching <micky_ching@realsil.com.cn> | 2014-06-23 13:22:04 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-19 18:45:04 +0100 |
| commit | fed533bb941e2d3155c89bab8a43493c85bdcb56 (patch) | |
| tree | 7a758d97a529c71a718ef469430adcdc5645c209 | |
| parent | bbd951a21e0fd555cd9ede44c7196af09d04d171 (diff) | |
| download | lwn-fed533bb941e2d3155c89bab8a43493c85bdcb56.tar.gz lwn-fed533bb941e2d3155c89bab8a43493c85bdcb56.zip | |
drivers/memstick/host/rtsx_pci_ms.c: add cancel_work when remove driver
commit b6226b45c66196e14ef628d3aead2139700db1ad upstream.
Add cancel_work_sync() in rtsx_pci_ms_drv_remove() to cancel pending
request work when removing the driver.
Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
Cc: Samuel Ortiz <sameo@linux.intel.com> says:
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Roger Tseng <rogerable@realtek.com>
Cc: Wei WANG <wei_wang@realsil.com.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/memstick/host/rtsx_pci_ms.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/memstick/host/rtsx_pci_ms.c b/drivers/memstick/host/rtsx_pci_ms.c index 25f8f93decb6..8d70fcf18901 100644 --- a/drivers/memstick/host/rtsx_pci_ms.c +++ b/drivers/memstick/host/rtsx_pci_ms.c @@ -591,6 +591,7 @@ static int rtsx_pci_ms_drv_remove(struct platform_device *pdev) pcr->slots[RTSX_MS_CARD].card_event = NULL; msh = host->msh; host->eject = true; + cancel_work_sync(&host->handle_req); mutex_lock(&host->host_mutex); if (host->req) { |