Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=eb7a1698d24783dd215cb86a12cadebe9b4e7046
Commit:     eb7a1698d24783dd215cb86a12cadebe9b4e7046
Parent:     05dd7ed2c7e22d0fc3027fc27a072664bbdf8274
Author:     Johannes Dickgreber <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 3 13:22:19 2007 +0200
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sun Oct 21 10:53:02 2007 -0500

    [SCSI] qla1280: uses wrong failure path after failed pci_set_dma_mask
    
    A failure here wouldn't currently free the irq; go to the irq free
    path instead.
    
    Signed-off-by: Johannes Dickgreber <[EMAIL PROTECTED]>
    Acked-by: Jes Sorensen <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/qla1280.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 76089cf..3aeb68b 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4310,7 +4310,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct 
pci_device_id *id)
                        printk(KERN_WARNING "scsi(%li): Unable to set a "
                               "suitable DMA mask - aborting\n", ha->host_no);
                        error = -ENODEV;
-                       goto error_free_irq;
+                       goto error_put_host;
                }
        } else
                dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n",
@@ -4320,7 +4320,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct 
pci_device_id *id)
                printk(KERN_WARNING "scsi(%li): Unable to set a "
                       "suitable DMA mask - aborting\n", ha->host_no);
                error = -ENODEV;
-               goto error_free_irq;
+               goto error_put_host;
        }
 #endif
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to