1 files changed, 11 insertions, 2 deletions

diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 116ca3746adb..b1ffebec9b9e 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -596,8 +596,7 @@ static pci_ers_result_t pcifront_common_process(int cmd,
         pcidev = pci_get_bus_and_slot(bus, devfn);
         if (!pcidev || !pcidev->driver) {
                 dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
-                if (pcidev)
-                        pci_dev_put(pcidev);
+                pci_dev_put(pcidev);
                 return result;
         }
         pdrv = pcidev->driver;
@@ -866,6 +865,11 @@ static int pcifront_try_connect(struct pcifront_device *pdev)
                 xenbus_dev_error(pdev->xdev, err,
                                  "No PCI Roots found, trying 0000:00");
                 err = pcifront_scan_root(pdev, 0, 0);
+                if (err) {
+                        xenbus_dev_fatal(pdev->xdev, err,
+                                         "Error scanning PCI root 0000:00");
+                        goto out;
+                }
                 num_roots = 0;
         } else if (err != 1) {
                 if (err == 0)
@@ -947,6 +951,11 @@ static int pcifront_attach_devices(struct pcifront_device *pdev)
                 xenbus_dev_error(pdev->xdev, err,
                                  "No PCI Roots found, trying 0000:00");
                 err = pcifront_rescan_root(pdev, 0, 0);
+                if (err) {
+                        xenbus_dev_fatal(pdev->xdev, err,
+                                         "Error scanning PCI root 0000:00");
+                        goto out;
+                }
                 num_roots = 0;
         } else if (err != 1) {
                 if (err == 0)