Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311763
b: refs/heads/master
c: 42b14cb
h: refs/heads/master
i:
  311761: 3373c6a
  311759: 18f1161
v: v3
  • Loading branch information
Roland Stigge authored and Linus Walleij committed Jul 5, 2012
1 parent be8d46c commit 6d8062c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3996bfc787a3b3d7c7ad97b7519247f9f2ac4068
refs/heads/master: 42b14cb037fefa33a2ff51c4d3915a49c71de3d5
4 changes: 2 additions & 2 deletions trunk/arch/mips/pci/pci-lantiq.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static int __devinit ltq_pci_startup(struct platform_device *pdev)

/* 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 */
Expand Down Expand Up @@ -192,7 +192,7 @@ static int __devinit ltq_pci_startup(struct platform_device *pdev)
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);
Expand Down

0 comments on commit 6d8062c

Please sign in to comment.