[SCSI] qla2xxx: Remove duplicate pci_disable_device() call

On the path qla2x00_probe_one() -> probe_failed -> qla2x00_free_device(),
pci_disable_device() is executed twice, once in qla2x00_free_device()
and once in qla2x00_probe_one().

This patch removes the unnecessary call.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Acked-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b6c96a8e0337..b78919a318e2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1707,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
         scsi_host_put(ha->host);
 
+        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 }
 
@@ -1749,8 +1750,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         if (ha->iobase)
                 iounmap(ha->iobase);
         pci_release_regions(ha->pdev);
-
-        pci_disable_device(ha->pdev);
 }
 
 static inline void