From f4e4473ec8585d17ab6666f4740e19d681fd1f67 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 12 Sep 2010 12:56:44 +0100 Subject: [PATCH] --- yaml --- r: 212427 b: refs/heads/master c: 18a06301158b5e4e9fae29e477f468e23f3eda90 h: refs/heads/master i: 212425: 7b44420ac8056a65123801c755998c8b67bdf3de 212423: 12d0e67ba5b4e72f55396c2838133a71cb4d06d4 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/mmci.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 61315cc21985..2ce9a4a6fcc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b8caec09562ce7e6e3aaf2954eef8ea73ba67b8 +refs/heads/master: 18a06301158b5e4e9fae29e477f468e23f3eda90 diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c index fd89d9230928..f2e02d7d9f3d 100644 --- a/trunk/drivers/mmc/host/mmci.c +++ b/trunk/drivers/mmc/host/mmci.c @@ -580,7 +580,7 @@ static int mmci_get_ro(struct mmc_host *mmc) if (host->gpio_wp == -ENOSYS) return -ENOSYS; - return gpio_get_value(host->gpio_wp); + return gpio_get_value_cansleep(host->gpio_wp); } static int mmci_get_cd(struct mmc_host *mmc) @@ -595,7 +595,8 @@ static int mmci_get_cd(struct mmc_host *mmc) status = plat->status(mmc_dev(host->mmc)); } else - status = !!gpio_get_value(host->gpio_cd) ^ plat->cd_invert; + status = !!gpio_get_value_cansleep(host->gpio_cd) + ^ plat->cd_invert; /* * Use positive logic throughout - status is zero for no card,