diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-03-05 13:43:37 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 09:07:04 -0700 |
commit | b4705ec3af69e0ba1bbde3dd412261941c3e78d5 (patch) | |
tree | 63367db7d2f9e0ae0d357a29d72239513b77adbb | |
parent | daaeb8a8219068bdb6dc597fc4dfe8fcab9dbc4c (diff) |
s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin
commit dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 upstream.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/mmc/host/s3cmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index d96e1abf2d6..93c34b2b26f 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1179,7 +1179,7 @@ static int s3cmci_card_present(struct mmc_host *mmc) struct s3c24xx_mci_pdata *pdata = host->pdata; int ret; - if (pdata->gpio_detect == 0) + if (pdata->no_detect) return -ENOSYS; ret = gpio_get_value(pdata->gpio_detect) ? 0 : 1; |