lkml.org 
[lkml]   [2007]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] [qla2xxx] Remove duplicate pci_disable_device() call
[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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2007-03-28 00:53    [W:0.414 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site