Upgrade to 4.4.50-rt62

[kvmfornfv.git] / kernel / drivers / mmc / host / mmc_spi.c

diff --git a/kernel/drivers/mmc/host/mmc_spi.c b/kernel/drivers/mmc/host/mmc_spi.c
index 1c1b45e..aad3243 100644 (file)
--- a/kernel/drivers/mmc/host/mmc_spi.c
+++ b/kernel/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);
        }