diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-03-05 22:43:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 20:26:37 +0100 |
| commit | dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 (patch) | |
| tree | a5080fb6fb989d92b522f78f3cbfb04e1e95f24e /drivers/mmc | |
| parent | s3cmci: initialize default platform data no_wprotect and no_detect with 1 (diff) | |
| download | linux-dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396.tar.xz linux-dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396.zip | |
s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: <linux-mmc@vger.kernel.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 b9c96cc87b04..2fdf7689ae6c 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; |