mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-18 23:18:20 +00:00
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>
This commit is contained in:
parent
cb3771b049
commit
e39506b466
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user