aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/msi.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-06-29 10:51:04 +0100
committerJon Medhurst <tixy@linaro.org>2015-06-29 10:51:04 +0100
commitbbd2adadfe34da61f27882492a9ef3d578a42d58 (patch)
tree3b6e5c70270c15afc4f0993b26107673b5632bfb /drivers/pci/msi.c
parentbadfba63d7f03e094833041b274e8956f34688f0 (diff)
parente2993fbb2772ffeb1eb05fba12eb68febc441b09 (diff)
Merge branch 'tracking-armlt-juno-pci' into integration-linaro-vexpress64tracking-integration-linaro-vexpress-ll-20150629.0
Diffstat (limited to 'drivers/pci/msi.c')
-rw-r--r--drivers/pci/msi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index c3e7dfcf9ff5..1bed857e7abb 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -41,8 +41,7 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
{
struct irq_domain *domain = NULL;
- if (dev->bus->msi)
- domain = dev->bus->msi->domain;
+ domain = dev_get_msi_domain(&dev->dev);
if (!domain)
domain = arch_get_pci_msi_domain(dev);