Skip to contentSkip to conversation

drivers/block/* - compile warning

PATCH In review Stephen Biggs 2 participants 2 messages Feb 14, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/21 drivers/block/* - compile warning

Description: compile warning cleanups - handle error return from scsi_add_host

drivers/block/cciss_scsi.c +2 -1
diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/block/cciss_scsi.c linux-2.6.11-rc3-mm2/drivers/block/cciss_scsi.c
@@ -706,7 +706,8 @@ 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 */
+	if (scsi_add_host(sh, &hba[ctlr]->pdev->dev))
+		return 0;
 	scsi_scan_host(sh);
 
 	return 1;

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw

On Tue, Feb 15, 2005 at 12:02:51AM +0200, Stephen Biggs wrote:
Content-Description: Mail message body

Quoted 10 lines

Description: compile warning cleanups - handle error return from scsi_add_host

diff -Nurdp -X dontdiff-osdl linux-2.6.11-rc3-mm2-original/drivers/block/cciss_scsi.c linux-2.6.11-rc3-mm2/drivers/block/cciss_scsi.c

drivers/block/cciss_scsi.c cciss_scsi_detect(int ctlr) · line 713

Quoted 9 lines
drivers/block/cciss_scsi.c +2 -1
@@ -706,7 +706,8 @@ 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 */
+	if (scsi_add_host(sh, &hba[ctlr]->pdev->dev))
+		return 0;
 	scsi_scan_host(sh);
 
 	return 1;

This has already been fixed properly in Linus' tree. You missed the undoing of the scsi_host_alloc in the failure path.

Dave

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors