diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/xen-pcifront.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index 5c7b6ad68056..492b7d807fe8 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c | |||
@@ -243,7 +243,7 @@ struct pci_ops pcifront_bus_ops = { | |||
243 | 243 | ||
244 | #ifdef CONFIG_PCI_MSI | 244 | #ifdef CONFIG_PCI_MSI |
245 | static int pci_frontend_enable_msix(struct pci_dev *dev, | 245 | static int pci_frontend_enable_msix(struct pci_dev *dev, |
246 | int **vector, int nvec) | 246 | int vector[], int nvec) |
247 | { | 247 | { |
248 | int err; | 248 | int err; |
249 | int i; | 249 | int i; |
@@ -282,10 +282,10 @@ static int pci_frontend_enable_msix(struct pci_dev *dev, | |||
282 | dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n", | 282 | dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n", |
283 | i, op.msix_entries[i].vector); | 283 | i, op.msix_entries[i].vector); |
284 | err = -EINVAL; | 284 | err = -EINVAL; |
285 | *(*vector+i) = -1; | 285 | vector[i] = -1; |
286 | continue; | 286 | continue; |
287 | } | 287 | } |
288 | *(*vector+i) = op.msix_entries[i].vector; | 288 | vector[i] = op.msix_entries[i].vector; |
289 | } | 289 | } |
290 | } else { | 290 | } else { |
291 | printk(KERN_DEBUG "enable msix get value %x\n", | 291 | printk(KERN_DEBUG "enable msix get value %x\n", |
@@ -316,7 +316,7 @@ static void pci_frontend_disable_msix(struct pci_dev *dev) | |||
316 | dev_err(&dev->dev, "pci_disable_msix get err %x\n", err); | 316 | dev_err(&dev->dev, "pci_disable_msix get err %x\n", err); |
317 | } | 317 | } |
318 | 318 | ||
319 | static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) | 319 | static int pci_frontend_enable_msi(struct pci_dev *dev, int vector[]) |
320 | { | 320 | { |
321 | int err; | 321 | int err; |
322 | struct xen_pci_op op = { | 322 | struct xen_pci_op op = { |
@@ -330,12 +330,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector) | |||
330 | 330 | ||
331 | err = do_pci_op(pdev, &op); | 331 | err = do_pci_op(pdev, &op); |
332 | if (likely(!err)) { | 332 | if (likely(!err)) { |
333 | *(*vector) = op.value; | 333 | vector[0] = op.value; |
334 | if (op.value <= 0) { | 334 | if (op.value <= 0) { |
335 | dev_warn(&dev->dev, "MSI entry is invalid: %d!\n", | 335 | dev_warn(&dev->dev, "MSI entry is invalid: %d!\n", |
336 | op.value); | 336 | op.value); |
337 | err = -EINVAL; | 337 | err = -EINVAL; |
338 | *(*vector) = -1; | 338 | vector[0] = -1; |
339 | } | 339 | } |
340 | } else { | 340 | } else { |
341 | dev_err(&dev->dev, "pci frontend enable msi failed for dev " | 341 | dev_err(&dev->dev, "pci frontend enable msi failed for dev " |