This is a note to let you know that I've just added the patch titled
mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-core-drop-check-for-mmc_card_is_removable-in-mmc_rescan.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 99b4ddd8b76a6f60a8c2b3775849d65d21a418fc Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Date: Thu, 10 Oct 2019 15:54:37 +0200
Subject: mmc: core: Drop check for mmc_card_is_removable() in mmc_rescan()
From: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
commit 99b4ddd8b76a6f60a8c2b3775849d65d21a418fc upstream.
Upfront in mmc_rescan() we use the host->rescan_entered flag, to allow
scanning only once for non-removable cards. Therefore, it's also not
possible that we can have a corresponding card bus attached (host->bus_ops
is NULL), when we are scanning non-removable cards.
For this reason, let' drop the check for mmc_card_is_removable() as it's
redundant.
Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
Tested-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v5.4+
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/core/core.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2297,11 +2297,8 @@ void mmc_rescan(struct work_struct *work
mmc_bus_get(host);
- /*
- * if there is a _removable_ card registered, check whether it is
- * still present
- */
- if (host->bus_ops && !host->bus_dead && mmc_card_is_removable(host))
+ /* Verify a registered card to be functional, else remove it. */
+ if (host->bus_ops && !host->bus_dead)
host->bus_ops->detect(host);
host->detect_change = 0;
Patches currently in stable-queue which might be from ulf.hansson@xxxxxxxxxx are
queue-5.4/mmc-block-make-card_busy_detect-a-bit-more-generic.patch
queue-5.4/mmc-core-re-work-hw-reset-for-sdio-cards.patch
queue-5.4/mmc-core-drop-check-for-mmc_card_is_removable-in-mmc_rescan.patch
queue-5.4/mmc-block-add-cmd13-polling-for-mmc-ioctls-with-r1b-response.patch
