android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] ips: handle scsi_add_host() failure, and other err cleanups

Browse Source 
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>
This commit is contained in:
Jeff Garzik 2007-12-13 16:14:10 -08:00 committed by James Bottomley
parent 21e1a5f26c
commit 2551a13e61
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/scsi/ips.c
View File

@ -6837,13 +6837,10 @@ ips_register_scsi(int index)
if (request_irq(ha->pcidev->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) { if (request_irq(ha->pcidev->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {
IPS_PRINTK(KERN_WARNING, ha->pcidev, IPS_PRINTK(KERN_WARNING, ha->pcidev,
"Unable to install interrupt handler\n"); "Unable to install interrupt handler\n");
scsi_host_put(sh); goto err_out_sh;
return -1;
} }
kfree(oldha); kfree(oldha);
ips_sh[index] = sh;
ips_ha[index] = ha;
/* Store away needed values for later use */ /* Store away needed values for later use */
sh->unique_id = (ha->io_addr) ? ha->io_addr : ha->mem_addr; 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->max_channel = ha->nbus - 1;
sh->can_queue = ha->max_cmds - 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); scsi_scan_host(sh);
return 0; return 0;
err_out:
free_irq(ha->pcidev->irq, ha);
err_out_sh:
scsi_host_put(sh);
return -1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/