git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 Mon Sep 17 00:00:00 2001
   2 From: Lars-Peter Clausen <lars@metafoo.de>
   3 Date: Fri, 5 Mar 2010 13:43:37 -0800
   4 Subject: s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin
   5
   6 From: Lars-Peter Clausen <lars@metafoo.de>
   7
   8 commit dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 upstream.
   9
  10 Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
  11 Cc: Ben Dooks <ben-linux@fluff.org>
  12 Cc: <linux-mmc@vger.kernel.org>
  13 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  14 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  drivers/mmc/host/s3cmci.c |    2 +-
  19  1 file changed, 1 insertion(+), 1 deletion(-)
  20
  21 --- a/drivers/mmc/host/s3cmci.c
  22 +++ b/drivers/mmc/host/s3cmci.c
  23 @@ -1179,7 +1179,7 @@ static int s3cmci_card_present(struct mm
  24         struct s3c24xx_mci_pdata *pdata = host->pdata;
  25         int ret;
  26
  27 -       if (pdata->gpio_detect == 0)
  28 +       if (pdata->no_detect)
  29                 return -ENOSYS;
  30
  31         ret = gpio_get_value(pdata->gpio_detect) ? 0 : 1;