summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKai-Heng Feng <kai.heng.feng@canonical.com>2020-09-25 16:49:51 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-07 08:01:25 +0200
commitde21eb7f8cb0045aedcfe8083fbebedf1209a3ae (patch)
tree8518db8af862fca666055793d89bc4dff825edc1 /include
parentc524a17312d4c4ab8df79928aa1214d5afd086a9 (diff)
memstick: Skip allocating card when removing host
commit 62c59a8786e6bb75569cee91dab66e9da3ff4b68 upstream. After commit 6827ca573c03 ("memstick: rtsx_usb_ms: Support runtime power management"), removing module rtsx_usb_ms will be stuck. The deadlock is caused by powering on and powering off at the same time, the former one is when memstick_check() is flushed, and the later is called by memstick_remove_host(). Soe let's skip allocating card to prevent this issue. Fixes: 6827ca573c03 ("memstick: rtsx_usb_ms: Support runtime power management") Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Link: https://lore.kernel.org/r/20200925084952.13220-1-kai.heng.feng@canonical.com Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/memstick.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memstick.h b/include/linux/memstick.h
index 216a713bef7f..1198ea3d4012 100644
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
@@ -281,6 +281,7 @@ struct memstick_host {
struct memstick_dev *card;
unsigned int retries;
+ bool removing;
/* Notify the host that some requests are pending. */
void (*request)(struct memstick_host *host);