Return-Path: Message-Id: <20130813155834.985805536@goodmis.org> Date: Tue, 13 Aug 2013 11:58:06 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Joachim Eastwood , Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Greg Kroah-Hartman Subject: [72/88] pcmcia: at91_cf: fix gpio_get_value in at91_cf_get_status References: <20130813155654.069291373@goodmis.org> Content-Disposition: inline; filename=0072-pcmcia-at91_cf-fix-gpio_get_value-in-at91_cf_get_sta.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.7-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Joachim Eastwood [ Upstream commit e39506b466edcda2a7e9d0174d7987ae654137b7 ] 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 Signed-off-by: Nicolas Ferre Acked-by: Jean-Christophe PLAGNIOL-VILLARD Cc: stable # 3.4+ Signed-off-by: Greg Kroah-Hartman Signed-off-by: Steven Rostedt --- drivers/pcmcia/at91_cf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index 9694c1e..fc50168 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; -- 1.7.10.4