scsi: qla2xxx: Complain if a soft reset fails

[linux-2.6-block.git] / drivers / scsi / qla2xxx / qla_tmpl.c

diff --git a/drivers/scsi/qla2xxx/qla_tmpl.c b/drivers/scsi/qla2xxx/qla_tmpl.c
index de696a07532ec725e717c90b4245dbc17d0df80d..294d77c02cdf6e78e73318b19688e7041d8350d8 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_tmpl.c
+++ b/drivers/scsi/qla2xxx/qla_tmpl.c
@@ -429,7 +429,7 @@ qla27xx_fwdt_entry_t266(struct scsi_qla_host *vha,
        ql_dbg(ql_dbg_misc, vha, 0xd20a,
            "%s: reset risc [%lx]\n", __func__, *len);
        if (buf)
-               qla24xx_soft_reset(vha->hw);
+               WARN_ON_ONCE(qla24xx_soft_reset(vha->hw) != QLA_SUCCESS);
 
        return qla27xx_next_entry(ent);
 }
@@ -860,8 +860,9 @@ qla27xx_driver_info(struct qla27xx_fwdt_template *tmp)
 {
        uint8_t v[] = { 0, 0, 0, 0, 0, 0 };
 
-       sscanf(qla2x00_version_str, "%hhu.%hhu.%hhu.%hhu.%hhu.%hhu",
-           v+0, v+1, v+2, v+3, v+4, v+5);
+       WARN_ON_ONCE(sscanf(qla2x00_version_str,
+                           "%hhu.%hhu.%hhu.%hhu.%hhu.%hhu",
+                           v+0, v+1, v+2, v+3, v+4, v+5) != 6);
 
        tmp->driver_info[0] = v[3] << 24 | v[2] << 16 | v[1] << 8 | v[0];
        tmp->driver_info[1] = v[5] << 8 | v[4];