2012-06-27 22:37:14

by Roland Stigge

Subject: [PATCH RESEND] mips: pci-lantiq: Fix check for valid gpio

This patch fixes two checks for valid gpio number, formerly (wrongly)
considering zero as invalid, now using gpio_is_valid().

Signed-off-by: Roland Stigge <[email protected]>
Acked-by: Linus Walleij <[email protected]>
---
Applies to v3.5-rc4

arch/mips/pci/pci-lantiq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.orig/arch/mips/pci/pci-lantiq.c
+++ linux-2.6/arch/mips/pci/pci-lantiq.c
@@ -129,7 +129,7 @@ static int __devinit ltq_pci_startup(str

/* setup reset gpio used by pci */
reset_gpio = of_get_named_gpio(node, "gpio-reset", 0);
- if (reset_gpio > 0)
+ if (gpio_is_valid(reset_gpio))
devm_gpio_request(&pdev->dev, reset_gpio, "pci-reset");

/* enable auto-switching between PCI and EBU */
@@ -192,7 +192,7 @@ static int __devinit ltq_pci_startup(str
ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_PCC_IEN) | 0x10, LTQ_EBU_PCC_IEN);

/* toggle reset pin */
- if (reset_gpio > 0) {
+ if (gpio_is_valid(reset_gpio)) {
__gpio_set_value(reset_gpio, 0);
wmb();
mdelay(1);

2012-06-28 05:20:43

by John Crispin

Subject: Re: [PATCH RESEND] mips: pci-lantiq: Fix check for valid gpio

On 28/06/12 00:36, Roland Stigge wrote:
> This patch fixes two checks for valid gpio number, formerly (wrongly)
> considering zero as invalid, now using gpio_is_valid().
>
> Signed-off-by: Roland Stigge <[email protected]>
> Acked-by: Linus Walleij <[email protected]>

Acked-by: John Crispin <[email protected]>



Hi Ralf,

can you take this via your tree ?

Thanks,
John