Commit 5eb26989 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Greg Kroah-Hartman

pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status

commit e39506b4 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: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 540005dc
...@@ -100,9 +100,9 @@ static int at91_cf_get_status(struct pcmcia_socket *s, u_int *sp) ...@@ -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); int vcc = gpio_is_valid(cf->board->vcc_pin);
*sp = SS_DETECT | SS_3VCARD; *sp = SS_DETECT | SS_3VCARD;
if (!rdy || gpio_get_value(rdy)) if (!rdy || gpio_get_value(cf->board->irq_pin))
*sp |= SS_READY; *sp |= SS_READY;
if (!vcc || gpio_get_value(vcc)) if (!vcc || gpio_get_value(cf->board->vcc_pin))
*sp |= SS_POWERON; *sp |= SS_POWERON;
} else } else
*sp = 0; *sp = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment