[PATCH] handle scsi_add_host failure for aic79xx and fix compiler warning

From: Jesper Juhl
Date: Wed Dec 14 2005 - 13:26:30 EST



Add scsi_add_host() failure handling for aic79xx
Also silence a compiler warning :
drivers/scsi/aic7xxx/aic79xx_osm.c: In function `ahd_linux_register_host':
drivers/scsi/aic7xxx/aic79xx_osm.c:1099: warning: ignoring return value of `scsi_add_host', declared with attribute warn_unused_result


Signed-off-by: Jesper Juhl <jesper.juhl@xxxxxxxxx>
---

drivers/scsi/aic7xxx/aic79xx_osm.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)

--- linux-2.6.15-rc5-git3-orig/drivers/scsi/aic7xxx/aic79xx_osm.c 2005-12-04 18:48:12.000000000 +0100
+++ linux-2.6.15-rc5-git3/drivers/scsi/aic7xxx/aic79xx_osm.c 2005-12-14 19:14:41.000000000 +0100
@@ -1064,6 +1064,7 @@ ahd_linux_register_host(struct ahd_softc
struct Scsi_Host *host;
char *new_name;
u_long s;
+ int retval;

template->name = ahd->description;
host = scsi_host_alloc(template, sizeof(struct ahd_softc *));
@@ -1096,9 +1097,15 @@ ahd_linux_register_host(struct ahd_softc

host->transportt = ahd_linux_transport_template;

- scsi_add_host(host, &ahd->dev_softc->dev); /* XXX handle failure */
+ retval = scsi_add_host(host, &ahd->dev_softc->dev);
+ if (retval) {
+ printk(KERN_WARNING "aic79xx: scsi_add_host failed\n");
+ scsi_host_put(host);
+ return retval;
+ }
+
scsi_scan_host(host);
- return (0);
+ return 0;
}

uint64_t


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/