| To: | ralf@linux-mips.org, blogic@openwrt.org, jkosina@suse.cz, standby24x7@gmail.com, bhelgaas@google.com, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, grant.likely@secretlab.ca, linus.walleij@stericsson.com |
|---|---|
| Subject: | [PATCH] mips: pci-lantiq: Fix check for valid gpio |
| From: | Roland Stigge <stigge@antcom.de> |
| Date: | Mon, 18 Jun 2012 11:28:26 +0200 |
| Cc: | Roland Stigge <stigge@antcom.de> |
| List-archive: | <http://www.linux-mips.org/archives/linux-mips/> |
| List-help: | <mailto:ecartis@linux-mips.org?Subject=help> |
| List-id: | linux-mips <linux-mips.eddie.linux-mips.org> |
| List-owner: | <mailto:ralf@linux-mips.org> |
| List-post: | <mailto:linux-mips@linux-mips.org> |
| List-software: | Ecartis version 1.0.0 |
| List-subscribe: | <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips> |
| List-unsubscribe: | <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips> |
| Sender: | linux-mips-bounce@linux-mips.org |
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 <stigge@antcom.de>
---
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);
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH 09/14] ata: Use 32bit DMA in AHCI for Loongson 3., huacai chen |
|---|---|
| Next by Date: | [PATCH v2] MIPS: BCM63XX: fix SPI message control register handling for BCM6338/6348, Florian Fainelli |
| Previous by Thread: | [PATCH] MIPS: BCM63XX: fix SPI message control register handling for BCM6338/6348, Florian Fainelli |
| Next by Thread: | Re: [PATCH] mips: pci-lantiq: Fix check for valid gpio, Linus Walleij |
| Indexes: | [Date] [Thread] [Top] [All Lists] |