OSDN Git Service

Merge branch 'fixes' into next
authorUlf Hansson <ulf.hansson@linaro.org>
Thu, 28 Feb 2019 08:16:18 +0000 (09:16 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Thu, 28 Feb 2019 08:16:18 +0000 (09:16 +0100)
1  2 
drivers/mmc/core/block.c
drivers/mmc/core/core.c
drivers/mmc/host/mmc_spi.c
drivers/mmc/host/tmio_mmc_core.c

Simple merge
Simple merge
@@@ -1450,9 -1450,10 +1450,10 @@@ static int mmc_spi_probe(struct spi_dev
                mmc->caps &= ~MMC_CAP_NEEDS_POLL;
                mmc_gpiod_request_cd_irq(mmc);
        }
+       mmc_detect_change(mmc, 0);
  
        /* Index 1 is write protect/read only */
 -      status = mmc_gpiod_request_ro(mmc, NULL, 1, false, 0, NULL);
 +      status = mmc_gpiod_request_ro(mmc, NULL, 1, 0, NULL);
        if (status == -EPROBE_DEFER)
                goto fail_add_host;
        if (!status)
Simple merge