Commit b5c55104 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'stable/xen-pcifront-fixes' of...

Merge branch 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

* 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  MAINTAINERS: Mark XEN lists as moderated
  xen-pcifront: fix PCI reference leak
  xen-pcifront: Remove duplicate inclusion of headers.
  xen: fix memory leak in Xen PCI MSI/MSI-X allocator.
  MAINTAINERS: Update mailing list name for Xen pieces.
parents a0a6da1a b74831e6
...@@ -6598,14 +6598,14 @@ F: drivers/platform/x86 ...@@ -6598,14 +6598,14 @@ F: drivers/platform/x86
XEN PCI SUBSYSTEM XEN PCI SUBSYSTEM
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
L: xen-devel@lists.xensource.com L: xen-devel@lists.xensource.com (moderated for non-subscribers)
S: Supported S: Supported
F: arch/x86/pci/*xen* F: arch/x86/pci/*xen*
F: drivers/pci/*xen* F: drivers/pci/*xen*
XEN SWIOTLB SUBSYSTEM XEN SWIOTLB SUBSYSTEM
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
L: xen-devel@lists.xensource.com L: xen-devel@lists.xensource.com (moderated for non-subscribers)
S: Supported S: Supported
F: arch/x86/xen/*swiotlb* F: arch/x86/xen/*swiotlb*
F: drivers/xen/*swiotlb* F: drivers/xen/*swiotlb*
...@@ -6613,7 +6613,7 @@ F: drivers/xen/*swiotlb* ...@@ -6613,7 +6613,7 @@ F: drivers/xen/*swiotlb*
XEN HYPERVISOR INTERFACE XEN HYPERVISOR INTERFACE
M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
L: xen-devel@lists.xen.org L: xen-devel@lists.xensource.com (moderated for non-subscribers)
L: virtualization@lists.osdl.org L: virtualization@lists.osdl.org
S: Supported S: Supported
F: arch/x86/xen/ F: arch/x86/xen/
......
...@@ -147,8 +147,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) ...@@ -147,8 +147,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
irq = xen_allocate_pirq(v[i], 0, /* not sharable */ irq = xen_allocate_pirq(v[i], 0, /* not sharable */
(type == PCI_CAP_ID_MSIX) ? (type == PCI_CAP_ID_MSIX) ?
"pcifront-msi-x" : "pcifront-msi"); "pcifront-msi-x" : "pcifront-msi");
if (irq < 0) if (irq < 0) {
return -1; ret = -1;
goto free;
}
ret = set_irq_msi(irq, msidesc); ret = set_irq_msi(irq, msidesc);
if (ret) if (ret)
...@@ -164,7 +166,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) ...@@ -164,7 +166,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
if (ret == -ENODEV) if (ret == -ENODEV)
dev_err(&dev->dev, "Xen PCI frontend has not registered" \ dev_err(&dev->dev, "Xen PCI frontend has not registered" \
" MSI/MSI-X support!\n"); " MSI/MSI-X support!\n");
free:
kfree(v); kfree(v);
return ret; return ret;
} }
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/msi.h> #include <linux/msi.h>
#include <xen/xenbus.h>
#include <xen/interface/io/pciif.h> #include <xen/interface/io/pciif.h>
#include <asm/xen/pci.h> #include <asm/xen/pci.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
...@@ -576,8 +575,9 @@ static pci_ers_result_t pcifront_common_process(int cmd, ...@@ -576,8 +575,9 @@ static pci_ers_result_t pcifront_common_process(int cmd,
pcidev = pci_get_bus_and_slot(bus, devfn); pcidev = pci_get_bus_and_slot(bus, devfn);
if (!pcidev || !pcidev->driver) { if (!pcidev || !pcidev->driver) {
dev_err(&pcidev->dev, dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
"device or driver is NULL\n"); if (pcidev)
pci_dev_put(pcidev);
return result; return result;
} }
pdrv = pcidev->driver; pdrv = pcidev->driver;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment