Commit 3339d1e3 authored by Johan Rudholm's avatar Johan Rudholm Committed by Chris Ball

mmc: core: Do not rescan non-removable devices

If MMC_CAP_NONREMOVABLE is set, only issue a detect job on init.
Signed-off-by: default avatarJohan Rudholm <johan.rudholm@stericsson.com>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 36c179a9
...@@ -2053,6 +2053,11 @@ void mmc_rescan(struct work_struct *work) ...@@ -2053,6 +2053,11 @@ void mmc_rescan(struct work_struct *work)
if (host->rescan_disable) if (host->rescan_disable)
return; return;
/* If there is a non-removable card registered, only scan once */
if ((host->caps & MMC_CAP_NONREMOVABLE) && host->rescan_entered)
return;
host->rescan_entered = 1;
mmc_bus_get(host); mmc_bus_get(host);
/* /*
......
...@@ -300,6 +300,7 @@ struct mmc_host { ...@@ -300,6 +300,7 @@ struct mmc_host {
#endif #endif
int rescan_disable; /* disable card detection */ int rescan_disable; /* disable card detection */
int rescan_entered; /* used with nonremovable devices */
struct mmc_card *card; /* device attached to this host */ struct mmc_card *card; /* device attached to this host */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment