2 files changed, 24 insertions, 9 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 31e9f40e79a2..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
         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 *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
@@ -2105,7 +2112,7 @@ ahd_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                                           scmd_id(cmd),
                                           scmd_channel(cmd) + 'A',
                                           CAM_LUN_WILDCARD,
-                                          SCB_LIST_NULL, ROLE_INITIATOR) == 0)
+                                          SCB_LIST_NULL, ROLE_INITIATOR))
                                 break;
                 }
         }
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 7fc6454068e4..fd389e9f9460 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1061,10 +1061,11 @@ uint32_t aic7xxx_verbose;
 int
 ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *template)
 {
-        char     buf[80];
-        struct   Scsi_Host *host;
+        char    buf[80];
+        struct  Scsi_Host *host;
         char    *new_name;
-        u_long   s;
+        u_long  s;
+        int     retval;
 
         template->name = ahc->description;
         host = scsi_host_alloc(template, sizeof(struct ahc_softc *));
@@ -1097,9 +1098,16 @@ ahc_linux_register_host(struct ahc_softc *ahc, struct scsi_host_template *templa
 
         host->transportt = ahc_linux_transport_template;
 
-        scsi_add_host(host, (ahc->dev_softc ? &ahc->dev_softc->dev : NULL)); /* XXX handle failure */
+        retval = scsi_add_host(host,
+                        (ahc->dev_softc ? &ahc->dev_softc->dev : NULL));
+        if (retval) {
+                printk(KERN_WARNING "aic7xxx: scsi_add_host failed\n");
+                scsi_host_put(host);
+                return retval;
+        }
+
         scsi_scan_host(host);
-        return (0);
+        return 0;
 }
 
 /*
@@ -2169,7 +2177,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
                         if (ahc_match_scb(ahc, pending_scb, scmd_id(cmd),
                                           scmd_channel(cmd) + 'A',
                                           CAM_LUN_WILDCARD,
-                                          SCB_LIST_NULL, ROLE_INITIATOR) == 0)
+                                          SCB_LIST_NULL, ROLE_INITIATOR))
                                 break;
                 }
         }