[SCSI] qla2xxx: Check for ISP84xx before processing to get 84xx firmware version.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index c272af4..d416c35 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1198,9 +1198,11 @@ qla24xx_84xx_fw_version_show(struct device *dev,
        scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
        struct qla_hw_data *ha = vha->hw;
 
-       if (IS_QLA84XX(ha) && ha->cs84xx)
-               if (ha->cs84xx->op_fw_version == 0)
-                       rval = qla84xx_verify_chip(vha, status);
+       if (!IS_QLA84XX(ha))
+               return snprintf(buf, PAGE_SIZE, "\n");
+
+       if (ha->cs84xx && ha->cs84xx->op_fw_version == 0)
+               rval = qla84xx_verify_chip(vha, status);
 
        if ((rval == QLA_SUCCESS) && (status[0] == 0))
                return snprintf(buf, PAGE_SIZE, "%u\n",