2007-10-24 23:50:55

by Jeff Garzik

Subject: [PATCH 4/4] [SCSI] ips: handle scsi_add_host() failure, and other err cleanups

Signed-off-by: Jeff Garzik <[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 fb90b6c..b8e2f5a 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -6836,13 +6836,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;
@@ -6858,10 +6855,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;
}

/*---------------------------------------------------------------------------*/
--
1.5.2.4

2007-10-25 14:39:57

by Mark Salyzyn

Subject: RE: [PATCH 4/4] [SCSI] ips: handle scsi_add_host() failure, and other err cleanups

ACK. Inspected. cleanup with zero risk.

Sincerely -- Mark Salyzyn

> -----Original Message-----
> From: [email protected]
> [mailto:[email protected]] On Behalf Of Jeff Garzik
> Sent: Wednesday, October 24, 2007 7:49 PM
> To: LKML; [email protected]
> Cc: [email protected]
> Subject: [PATCH 4/4] [SCSI] ips: handle scsi_add_host()
> failure, and other err cleanups
>
> Signed-off-by: Jeff Garzik <[email protected]>
> ---
> drivers/scsi/ips.c | 18 +++++++++++++-----
> 1 files changed, 13 insertions(+), 5 deletions(-)