| From e39506b466edcda2a7e9d0174d7987ae654137b7 Mon Sep 17 00:00:00 2001 |
| From: Joachim Eastwood <manabian@gmail.com> |
| Date: Thu, 6 Jun 2013 10:24:14 +0200 |
| Subject: pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status |
| |
| From: Joachim Eastwood <manabian@gmail.com> |
| |
| commit e39506b466edcda2a7e9d0174d7987ae654137b7 upstream. |
| |
| Commit 80af9e6d (pcmcia at91_cf: fix raw gpio number usage) forgot |
| to change the parameter in gpio_get_value after adding gpio |
| validation. |
| |
| Signed-off-by: Joachim Eastwood <manabian@gmail.com> |
| Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pcmcia/at91_cf.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/pcmcia/at91_cf.c |
| +++ b/drivers/pcmcia/at91_cf.c |
| @@ -100,9 +100,9 @@ static int at91_cf_get_status(struct pcm |
| int vcc = gpio_is_valid(cf->board->vcc_pin); |
| |
| *sp = SS_DETECT | SS_3VCARD; |
| - if (!rdy || gpio_get_value(rdy)) |
| + if (!rdy || gpio_get_value(cf->board->irq_pin)) |
| *sp |= SS_READY; |
| - if (!vcc || gpio_get_value(vcc)) |
| + if (!vcc || gpio_get_value(cf->board->vcc_pin)) |
| *sp |= SS_POWERON; |
| } else |
| *sp = 0; |
