diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2007-12-13 16:14:10 -0800 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 18:28:02 -0600 |
| commit | 2551a13e61d3c3df6c2da6de5a3ece78e6d67111 (patch) | |
| tree | d9513a8a292430d5e51486ad8e053a4207161684 /drivers/scsi/ips.c | |
| parent | [SCSI] ips: PCI API cleanups (diff) | |
| download | linux-dev-2551a13e61d3c3df6c2da6de5a3ece78e6d67111.tar.xz linux-dev-2551a13e61d3c3df6c2da6de5a3ece78e6d67111.zip | |
[SCSI] ips: handle scsi_add_host() failure, and other err cleanups
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/ips.c')
| -rw-r--r-- | 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 5f194a807f94..e54d30c6a342 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; } /*---------------------------------------------------------------------------*/ |