The patch titled
qla2xxx: remove duplicate pci_disable_device() call
has been added to the -mm tree. Its filename is
qla2xxx-remove-duplicate-pci_disable_device-call.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: qla2xxx: remove duplicate pci_disable_device() call
From: Bernhard Walle <bwalle@xxxxxxx>
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@xxxxxxx>
Cc: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/qla2xxx/qla_os.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/scsi/qla2xxx/qla_os.c~qla2xxx-remove-duplicate-pci_disable_device-call drivers/scsi/qla2xxx/qla_os.c
--- a/drivers/scsi/qla2xxx/qla_os.c~qla2xxx-remove-duplicate-pci_disable_device-call
+++ a/drivers/scsi/qla2xxx/qla_os.c
@@ -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);
}
@@ -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
_
Patches currently in -mm which might be from bwalle@xxxxxxx are
origin.patch
git-r8169.patch
use-unchecked_isa_dma-in-sd_revalidate_disk.patch
qla2xxx-remove-duplicate-pci_disable_device-call.patch
x86_64-i386-add-command-line-length-to-boot-protocol.patch
x86_64-fix-section-mismatch-compile-warning.patch
add-irqf_irqpoll-flag-common-code.patch
add-irqf_irqpoll-flag-on-x86_64.patch
add-irqf_irqpoll-flag-on-i386.patch
add-irqf_irqpoll-flag-on-ia64.patch
add-irqf_irqpoll-flag-on-sh.patch
add-irqf_irqpoll-flag-on-parisc.patch
add-irqf_irqpoll-flag-on-arm.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
