Skip to contentSkip to conversation

Add scsi_add_host() failure handling for nsp32

PATCH In review [email protected] 1 participant 1 message Jun 25, 2006

Subsystems (2)
SCSI Ninja SCSI-32Bi/ude PCI/cardbus SCSI host adapter driver
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 19/26 Add scsi_add_host() failure handling for nsp32

From: GOTO Masanori <[email protected]>

Add scsi_add_host() failure handling for nsp32
and silence warning.
drivers/scsi/nsp32.c:2888: warning: ignoring return value of 'Scsi_add_host', declared with attribute warn_unused_result

Signed-off-by Jesper Juhl <[email protected]>
Signed-off-by GOTO Masanori <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/scsi/nsp32.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/scsi/nsp32.c renamed from drivers/scsi/nsp32.c~add-scsi_add_host-failure-handling-for-nsp32 +8 -1
diff -puN drivers/scsi/nsp32.c~add-scsi_add_host-failure-handling-for-nsp32 drivers/scsi/nsp32.c
@@ -2885,12 +2885,19 @@ static int nsp32_detect(struct scsi_host
         }
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
-	scsi_add_host (host, &PCIDEV->dev);
+	ret = scsi_add_host(host, &PCIDEV->dev);
+	if (ret) {
+		nsp32_msg(KERN_ERR, "failed to add scsi host");
+		goto free_region;
+	}
 	scsi_scan_host(host);
 #endif
 	pci_set_drvdata(PCIDEV, host);
 	return DETECT_OK;
 
+ free_region:
+	release_region(host->io_port, host->n_io_port);
+
  free_irq:
 	free_irq(host->irq, data);

_