]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 5 Mar 2010 21:43:37 +0000 (13:43 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 15 Mar 2010 15:50:14 +0000 (08:50 -0700)
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>
drivers/mmc/host/s3cmci.c

index 99b74a3510203a2e258d83c9f9f4d9aa4f9db816..f31f05a60f37d883fa47dd5d302cab573c2497ca 100644 (file)
@@ -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;