[134/145] s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin

From: Greg KH
Date: Fri Mar 12 2010 - 19:36:55 EST


2.6.32-stable review patch. If anyone has any objections, please let me know.

----------------
From: Lars-Peter Clausen <lars@xxxxxxxxxx>

commit dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 upstream.

Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Cc: Ben Dooks <ben-linux@xxxxxxxxx>
Cc: <linux-mmc@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
drivers/mmc/host/s3cmci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1178,7 +1178,7 @@ static int s3cmci_card_present(struct mm
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;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/