public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [qla2xxx] Remove duplicate pci_disable_device() call
@ 2007-03-27 22:49 Bernhard Walle
  2007-03-28 15:41 ` Andrew Vasquez
  0 siblings, 1 reply; 2+ messages in thread
From: Bernhard Walle @ 2007-03-27 22:49 UTC (permalink / raw)
  To: linux-scsi; +Cc: linux-kernel

[PATCH] [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>

---
 drivers/scsi/qla2xxx/qla_os.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: linux-2.6.21-rc5/drivers/scsi/qla2xxx/qla_os.c
===================================================================
--- linux-2.6.21-rc5.orig/drivers/scsi/qla2xxx/qla_os.c
+++ linux-2.6.21-rc5/drivers/scsi/qla2xxx/qla_os.c
@@ -1705,6 +1705,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
 	scsi_host_put(ha->host);
 
+	pci_disable_device(pdev);
 	pci_set_drvdata(pdev, NULL);
 }
 
@@ -1747,8 +1748,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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-03-28 15:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-27 22:49 [PATCH] [qla2xxx] Remove duplicate pci_disable_device() call Bernhard Walle
2007-03-28 15:41 ` Andrew Vasquez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox