diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-05 17:36:38 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-05 17:36:38 -0700 |
| commit | 7b415285ae96f5bfa0fa95d3227c6900c4ff151d (patch) | |
| tree | feb5198f57bfb5b58aca24ddc76a313236f94512 /drivers/irqchip/irq-gic-v3-its-pci-msi.c | |
| parent | c65cf815653ec64e73d40819806c2d1aed91681e (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
Merge tag 'v4.3-rc4' into next
Merge with mainline to sync up with changes to parkbd driver.
Diffstat (limited to 'drivers/irqchip/irq-gic-v3-its-pci-msi.c')
| -rw-r--r-- | drivers/irqchip/irq-gic-v3-its-pci-msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its-pci-msi.c b/drivers/irqchip/irq-gic-v3-its-pci-msi.c index cf351c637464..a7c8c9ffbafd 100644 --- a/drivers/irqchip/irq-gic-v3-its-pci-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-pci-msi.c @@ -62,7 +62,7 @@ static int its_get_pci_alias(struct pci_dev *pdev, u16 alias, void *data) dev_alias->dev_id = alias; if (pdev != dev_alias->pdev) - dev_alias->count += its_pci_msi_vec_count(dev_alias->pdev); + dev_alias->count += its_pci_msi_vec_count(pdev); return 0; } |