diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-12-14 13:27:28 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-12-14 21:52:24 -0500 |
commit | e7a1ca1d27e20ea2c0ba161c57e3c1d4112b60f7 (patch) | |
tree | 69a919a9d6d07b1ebb9dbb836b3d20bd78afb52e /drivers/scsi | |
parent | 829b84675edbe05f11c289946216da4f5c6b8e94 (diff) |
[SCSI] handle scsi_add_host failure for aic79xx and fix compiler warning
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@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 6aab9dacdeea..1c8f872e2dd4 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -1064,6 +1064,7 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa | |||
1064 | struct Scsi_Host *host; | 1064 | struct Scsi_Host *host; |
1065 | char *new_name; | 1065 | char *new_name; |
1066 | u_long s; | 1066 | u_long s; |
1067 | int retval; | ||
1067 | 1068 | ||
1068 | template->name = ahd->description; | 1069 | template->name = ahd->description; |
1069 | host = scsi_host_alloc(template, sizeof(struct ahd_softc *)); | 1070 | host = scsi_host_alloc(template, sizeof(struct ahd_softc *)); |
@@ -1096,9 +1097,15 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa | |||
1096 | 1097 | ||
1097 | host->transportt = ahd_linux_transport_template; | 1098 | host->transportt = ahd_linux_transport_template; |
1098 | 1099 | ||
1099 | scsi_add_host(host, &ahd->dev_softc->dev); /* XXX handle failure */ | 1100 | retval = scsi_add_host(host, &ahd->dev_softc->dev); |
1101 | if (retval) { | ||
1102 | printk(KERN_WARNING "aic79xx: scsi_add_host failed\n"); | ||
1103 | scsi_host_put(host); | ||
1104 | return retval; | ||
1105 | } | ||
1106 | |||
1100 | scsi_scan_host(host); | 1107 | scsi_scan_host(host); |
1101 | return (0); | 1108 | return 0; |
1102 | } | 1109 | } |
1103 | 1110 | ||
1104 | uint64_t | 1111 | uint64_t |