diff options
| -rw-r--r-- | drivers/of/of_pci_irq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/of/of_pci_irq.c b/drivers/of/of_pci_irq.c index 7e4e21438e28..1710d9dc7fc2 100644 --- a/drivers/of/of_pci_irq.c +++ b/drivers/of/of_pci_irq.c | |||
| @@ -18,7 +18,6 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq | |||
| 18 | { | 18 | { |
| 19 | struct device_node *dn, *ppnode; | 19 | struct device_node *dn, *ppnode; |
| 20 | struct pci_dev *ppdev; | 20 | struct pci_dev *ppdev; |
| 21 | u32 lspec; | ||
| 22 | __be32 laddr[3]; | 21 | __be32 laddr[3]; |
| 23 | u8 pin; | 22 | u8 pin; |
| 24 | int rc; | 23 | int rc; |
| @@ -45,7 +44,6 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq | |||
| 45 | return -ENODEV; | 44 | return -ENODEV; |
| 46 | 45 | ||
| 47 | /* Now we walk up the PCI tree */ | 46 | /* Now we walk up the PCI tree */ |
| 48 | lspec = pin; | ||
| 49 | for (;;) { | 47 | for (;;) { |
| 50 | /* Get the pci_dev of our parent */ | 48 | /* Get the pci_dev of our parent */ |
| 51 | ppdev = pdev->bus->self; | 49 | ppdev = pdev->bus->self; |
| @@ -79,13 +77,13 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq | |||
| 79 | /* We can only get here if we hit a P2P bridge with no node, | 77 | /* We can only get here if we hit a P2P bridge with no node, |
| 80 | * let's do standard swizzling and try again | 78 | * let's do standard swizzling and try again |
| 81 | */ | 79 | */ |
| 82 | lspec = pci_swizzle_interrupt_pin(pdev, lspec); | 80 | pin = pci_swizzle_interrupt_pin(pdev, pin); |
| 83 | pdev = ppdev; | 81 | pdev = ppdev; |
| 84 | } | 82 | } |
| 85 | 83 | ||
| 86 | out_irq->np = ppnode; | 84 | out_irq->np = ppnode; |
| 87 | out_irq->args_count = 1; | 85 | out_irq->args_count = 1; |
| 88 | out_irq->args[0] = lspec; | 86 | out_irq->args[0] = pin; |
| 89 | laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8)); | 87 | laddr[0] = cpu_to_be32((pdev->bus->number << 16) | (pdev->devfn << 8)); |
| 90 | laddr[1] = laddr[2] = cpu_to_be32(0); | 88 | laddr[1] = laddr[2] = cpu_to_be32(0); |
| 91 | return of_irq_parse_raw(laddr, out_irq); | 89 | return of_irq_parse_raw(laddr, out_irq); |
