Skip to content

Commit

Permalink
[SCSI] handle scsi_add_host failure for aic79xx and fix compiler warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jesper Juhl authored and James Bottomley committed Dec 15, 2005
1 parent 829b846 commit e7a1ca1
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions drivers/scsi/aic7xxx/aic79xx_osm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,7 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa
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 *));
Expand Down Expand Up @@ -1096,9 +1097,15 @@ ahd_linux_register_host(struct ahd_softc *ahd, struct scsi_host_template *templa

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
Expand Down

0 comments on commit e7a1ca1

Please sign in to comment.