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 08:50:14 -0700 |
commit | 31ec453d5d81138cf50ad1c9ac523e9aec3c3896 (patch) | |
tree | f137d7af43578a03df7c645bc321020bd37b212c /drivers/mmc | |
parent | c73b9e0e11be512641d478628baf0f870182dc7e (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>
Diffstat (limited to 'drivers/mmc')
-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 99b74a351020..f31f05a60f37 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1178,7 +1178,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; |