summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mmci.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-10-02 09:08:46 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2014-10-02 11:51:26 +0200
commit89168b48991537bec2573b3b6a8841df74465b12 (patch)
treef79f45a7a70b995da2fb0d7de39809dc8d2bd273 /drivers/mmc/host/mmci.c
parent6a98f1e83a2874a189754ded5254ae687828739e (diff)
downloadop-kernel-dev-89168b48991537bec2573b3b6a8841df74465b12.zip
op-kernel-dev-89168b48991537bec2573b3b6a8841df74465b12.tar.gz
mmc: core: restore detect line inversion semantics
commit 98e90de99a0c43bd434da814c882c4332441871e "mmc: host: switch OF parser to use gpio descriptors" switched the semantic behaviour of card detect and read only flags such that the inversion capability flag would only be set if inversion was explicitly specified in the device tree, in the hopes that no-one was using double inversion. It turns out that the XOR:ing between the explicit inversion was indeed in use, so we need to restore the old semantics where both ways of inversion are checked and the end result XOR:ed. Reported-by: Javier Martinez Canillas <javier@dowhile0.org> Tested-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-rw-r--r--drivers/mmc/host/mmci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index c9dafed..43af791 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1682,7 +1682,7 @@ static int mmci_probe(struct amba_device *dev,
* silently of these do not exist and proceed to try platform data
*/
if (!np) {
- ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0);
+ ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0, NULL);
if (ret < 0) {
if (ret == -EPROBE_DEFER)
goto clk_disable;
@@ -1693,7 +1693,7 @@ static int mmci_probe(struct amba_device *dev,
}
}
- ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0);
+ ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0, NULL);
if (ret < 0) {
if (ret == -EPROBE_DEFER)
goto clk_disable;
OpenPOWER on IntegriCloud