Re: [PATCH] cciss: handler scsi_add_host failure

[Christoph Hellwig <hch@lst.de>]

On Wed, Jan 05, 2005 at 09:24:23PM +0100, Christoph Hellwig wrote:
> On Wed, Jan 05, 2005 at 02:22:22PM -0600, Miller, Mike (OS Dev) wrote:
> > > From: Christoph Hellwig [mailto:hch@lst.de]
> > > 
> > > Mike, is this patch okay?
> > 
> > Christoph,
> > BTW, I meant to say thanks.
> 
> You're welcome :)

James, can you put this patch in?


--- 1.23/drivers/block/cciss_scsi.c	2004-10-14 16:15:25 +02:00
+++ edited/drivers/block/cciss_scsi.c	2004-12-31 14:42:51 +01:00
@@ -691,14 +691,13 @@ static int
 cciss_scsi_detect(int ctlr)
 {
 	struct Scsi_Host *sh;
+	int error;
 
 	sh = scsi_host_alloc(&cciss_driver_template, sizeof(struct ctlr_info *));
 	if (sh == NULL)
-		return 0;
-
+		goto fail;
 	sh->io_port = 0;	// good enough?  FIXME, 
 	sh->n_io_port = 0;	// I don't think we use these two...
-
 	sh->this_id = SELF_SCSI_ID;  
 
 	((struct cciss_scsi_adapter_data_t *) 
@@ -706,10 +705,16 @@ cciss_scsi_detect(int ctlr)
 	sh->hostdata[0] = (unsigned long) hba[ctlr];
 	sh->irq = hba[ctlr]->intr;
 	sh->unique_id = sh->irq;
-	scsi_add_host(sh, &hba[ctlr]->pdev->dev); /* XXX handle failure */
+	error = scsi_add_host(sh, &hba[ctlr]->pdev->dev);
+	if (error)
+		goto fail_host_put;
 	scsi_scan_host(sh);
-
 	return 1;
+
+ fail_host_put:
+	scsi_host_put(sh);
+ fail:
+	return 0;
 }
 
 static void __exit cleanup_cciss_module(void);