Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2551a13e61d3c3df6c2da6de5a3ece78e6d67111 Commit: 2551a13e61d3c3df6c2da6de5a3ece78e6d67111 Parent: 21e1a5f26c437591f67779a97e5cc95ebbb02e90 Author: Jeff Garzik <[EMAIL PROTECTED]> AuthorDate: Thu Dec 13 16:14:10 2007 -0800 Committer: James Bottomley <[EMAIL PROTECTED]> CommitDate: Fri Jan 11 18:28:02 2008 -0600
[SCSI] ips: handle scsi_add_host() failure, and other err cleanups Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]> Acked-by: "Salyzyn, Mark" <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: James Bottomley <[EMAIL PROTECTED]> --- drivers/scsi/ips.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 5f194a8..e54d30c 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -6837,13 +6837,10 @@ ips_register_scsi(int index) if (request_irq(ha->pcidev->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) { IPS_PRINTK(KERN_WARNING, ha->pcidev, "Unable to install interrupt handler\n"); - scsi_host_put(sh); - return -1; + goto err_out_sh; } kfree(oldha); - ips_sh[index] = sh; - ips_ha[index] = ha; /* Store away needed values for later use */ sh->unique_id = (ha->io_addr) ? ha->io_addr : ha->mem_addr; @@ -6859,10 +6856,21 @@ ips_register_scsi(int index) sh->max_channel = ha->nbus - 1; sh->can_queue = ha->max_cmds - 1; - scsi_add_host(sh, NULL); + if (scsi_add_host(sh, &ha->pcidev->dev)) + goto err_out; + + ips_sh[index] = sh; + ips_ha[index] = ha; + scsi_scan_host(sh); return 0; + +err_out: + free_irq(ha->pcidev->irq, ha); +err_out_sh: + scsi_host_put(sh); + return -1; } /*---------------------------------------------------------------------------*/ - 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