diff options
Diffstat (limited to 'arch/x86/pci/xen.c')
-rw-r--r-- | arch/x86/pci/xen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index ca5fa09ca56d..6fd695b06faa 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c | |||
@@ -100,8 +100,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
100 | pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) | | 100 | pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) | |
101 | ((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff); | 101 | ((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff); |
102 | if (xen_irq_from_pirq(pirq) >= 0 && msg.data == XEN_PIRQ_MSI_DATA) { | 102 | if (xen_irq_from_pirq(pirq) >= 0 && msg.data == XEN_PIRQ_MSI_DATA) { |
103 | xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? | 103 | irq = xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? |
104 | "msi-x" : "msi", &irq, &pirq, 0); | 104 | "msi-x" : "msi", &pirq, 0); |
105 | if (irq < 0) | 105 | if (irq < 0) |
106 | goto error; | 106 | goto error; |
107 | ret = set_irq_msi(irq, msidesc); | 107 | ret = set_irq_msi(irq, msidesc); |
@@ -111,8 +111,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
111 | " pirq=%d\n", irq, pirq); | 111 | " pirq=%d\n", irq, pirq); |
112 | return 0; | 112 | return 0; |
113 | } | 113 | } |
114 | xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? | 114 | irq = xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? |
115 | "msi-x" : "msi", &irq, &pirq, 1); | 115 | "msi-x" : "msi", &pirq, 1); |
116 | if (irq < 0 || pirq < 0) | 116 | if (irq < 0 || pirq < 0) |
117 | goto error; | 117 | goto error; |
118 | printk(KERN_DEBUG "xen: msi --> irq=%d, pirq=%d\n", irq, pirq); | 118 | printk(KERN_DEBUG "xen: msi --> irq=%d, pirq=%d\n", irq, pirq); |
@@ -157,10 +157,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
157 | goto error; | 157 | goto error; |
158 | i = 0; | 158 | i = 0; |
159 | list_for_each_entry(msidesc, &dev->msi_list, list) { | 159 | list_for_each_entry(msidesc, &dev->msi_list, list) { |
160 | xen_allocate_pirq_msi( | 160 | irq = xen_allocate_pirq_msi( |
161 | (type == PCI_CAP_ID_MSIX) ? | 161 | (type == PCI_CAP_ID_MSIX) ? |
162 | "pcifront-msi-x" : "pcifront-msi", | 162 | "pcifront-msi-x" : "pcifront-msi", |
163 | &irq, &v[i], 0); | 163 | &v[i], 0); |
164 | if (irq < 0) { | 164 | if (irq < 0) { |
165 | ret = -1; | 165 | ret = -1; |
166 | goto free; | 166 | goto free; |