From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Thu, 28 Feb 2019 08:16:18 +0000 (+0100)
Subject: Merge branch 'fixes' into next
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82b6248705cccc4341b4c1d4a80a70f018198db0;p=android-x86%2Fkernel.git

Merge branch 'fixes' into next
---

82b6248705cccc4341b4c1d4a80a70f018198db0
diff --cc drivers/mmc/host/mmc_spi.c
index d7a5bbeb391b,8ade14fb2148..1b1498805972
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@@ -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)