提交 665db93b 编写于 作者: B Bernhard Walle 提交者: James Bottomley

[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: NBernhard Walle <bwalle@suse.de>
Acked-by: NAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
上级 4dfb7cbe
...@@ -1707,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev) ...@@ -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) ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册