[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>
This commit is contained in:
parent
4dfb7cbef8
commit
665db93b8a
1 changed files with 1 additions and 2 deletions
|
@ -1707,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
|
||||||
|
|
||||||
scsi_host_put(ha->host);
|
scsi_host_put(ha->host);
|
||||||
|
|
||||||
|
pci_disable_device(pdev);
|
||||||
pci_set_drvdata(pdev, NULL);
|
pci_set_drvdata(pdev, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1749,8 +1750,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)
|
||||||
if (ha->iobase)
|
if (ha->iobase)
|
||||||
iounmap(ha->iobase);
|
iounmap(ha->iobase);
|
||||||
pci_release_regions(ha->pdev);
|
pci_release_regions(ha->pdev);
|
||||||
|
|
||||||
pci_disable_device(ha->pdev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
|
|
Loading…
Add table
Reference in a new issue