Skip to content

Commit

Permalink
[SCSI] qla2xxx: Remove duplicate pci_disable_device() call
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bernhard Walle authored and James Bottomley committed Apr 1, 2007
1 parent 4dfb7cb commit 665db93
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/scsi/qla2xxx/qla_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 665db93

Please sign in to comment.