diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-05 13:36:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-05 13:36:03 +0800 |
| commit | e91b1cc90283c1b9b75670b027a18afbd20fe070 (patch) | |
| tree | 81c395406a3774775a183d544aee9c5ced1c31d6 /drivers/mmc/host/mmc_spi.c | |
| parent | d83731cf53fd3af7173cab5e3f573d06ebc852be (diff) | |
| parent | 0b3df30dcadcddc56aed56c3c2d2de2ca963e81d (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.06-rtlsk-v4.1-16.05-rt
Diffstat (limited to 'drivers/mmc/host/mmc_spi.c')
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index ae19d83bb9de..055cad1e94d5 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -1436,6 +1436,12 @@ static int mmc_spi_probe(struct spi_device *spi) host->pdata->cd_debounce); if (status != 0) goto fail_add_host; + + /* The platform has a CD GPIO signal that may support + * interrupts, so let mmc_gpiod_request_cd_irq() decide + * if polling is needed or not. + */ + mmc->caps &= ~MMC_CAP_NEEDS_POLL; mmc_gpiod_request_cd_irq(mmc); } |