From 107cfd7db3cb3f49dc7359f989d7d3506bb5b2c3 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 4 Nov 2010 15:31:30 +0100
Subject: [PATCH] --- yaml --- r: 221888 b: refs/heads/master c:
 2a63dd7275b2278bd7e9203f74b9aa4f07e82a7a h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/pci/xen-pcifront.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8c5d6a874617..191c40b65c4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8ac3902fb7a98c45ed54d98ad6f1c8168f47021
+refs/heads/master: 2a63dd7275b2278bd7e9203f74b9aa4f07e82a7a
diff --git a/trunk/drivers/pci/xen-pcifront.c b/trunk/drivers/pci/xen-pcifront.c
index 05792732718e..3a5a6fcc0ead 100644
--- a/trunk/drivers/pci/xen-pcifront.c
+++ b/trunk/drivers/pci/xen-pcifront.c
@@ -575,8 +575,9 @@ static pci_ers_result_t pcifront_common_process(int cmd,
 
 	pcidev = pci_get_bus_and_slot(bus, devfn);
 	if (!pcidev || !pcidev->driver) {
-		dev_err(&pcidev->dev,
-			"device or driver is NULL\n");
+		dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
+		if (pcidev)
+			pci_dev_put(pcidev);
 		return result;
 	}
 	pdrv = pcidev->driver;