diff options
| author | Joachim Eastwood <manabian@gmail.com> | 2013-06-06 10:24:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-06 21:57:41 +0200 |
| commit | e39506b466edcda2a7e9d0174d7987ae654137b7 (patch) | |
| tree | 635e1d8763c95df9d53c6e1df9561c5c64be9c3a /drivers/pcmcia/at91_cf.c | |
| parent | uio: uio_pruss: Fix potential NULL pointer dereference (diff) | |
| download | linux-e39506b466edcda2a7e9d0174d7987ae654137b7.tar.xz linux-e39506b466edcda2a7e9d0174d7987ae654137b7.zip | |
pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status
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>
Cc: stable <stable@vger.kernel.org> # 3.4+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia/at91_cf.c')
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 01463c781847..1b2c6317c772 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -100,9 +100,9 @@ static int at91_cf_get_status(struct pcmcia_socket *s, u_int *sp) 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; |