mmc: core: Do not rescan non-removable devices

If MMC_CAP_NONREMOVABLE is set, only issue a detect job on init.

Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Johan Rudholm 2012-08-23 13:40:55 +02:00 committed by Chris Ball
parent 36c179a98a
commit 3339d1e331
2 changed files with 6 additions and 0 deletions

View File

@ -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);
/* /*

View File

@ -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 */