projects
/
platform
/
kernel
/
linux-exynos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: host: use the defined function to check whether card is removable
[platform/kernel/linux-exynos.git]
/
drivers
/
mmc
/
host
/
dw_mmc.c
diff --git
a/drivers/mmc/host/dw_mmc.c
b/drivers/mmc/host/dw_mmc.c
index
2cc6123
..
8012858
100644
(file)
--- a/
drivers/mmc/host/dw_mmc.c
+++ b/
drivers/mmc/host/dw_mmc.c
@@
-1451,8
+1451,7
@@
static int dw_mci_get_cd(struct mmc_host *mmc)
int gpio_cd = mmc_gpio_get_cd(mmc);
/* Use platform get_cd function, else try onboard card detect */
int gpio_cd = mmc_gpio_get_cd(mmc);
/* Use platform get_cd function, else try onboard card detect */
- if ((mmc->caps & MMC_CAP_NEEDS_POLL) ||
- (mmc->caps & MMC_CAP_NONREMOVABLE))
+ if ((mmc->caps & MMC_CAP_NEEDS_POLL) || !mmc_card_is_removable(mmc))
present = 1;
else if (gpio_cd >= 0)
present = gpio_cd;
present = 1;
else if (gpio_cd >= 0)
present = gpio_cd;