1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 29bd2258ab6f..97ce44bb1ce9 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -5449,6 +5449,13 @@ static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)
 {
         struct scsi_qla_host *ha;
 
+        /*
+         * If the PCI device is disabled then it means probe_adapter had
+         * failed and resources already cleaned up on probe_adapter exit.
+         */
+        if (!pci_is_enabled(pdev))
+                return;
+
         ha = pci_get_drvdata(pdev);
 
         if (is_qla40XX(ha))