From d81f3c50f8fb79428aed30370f86500bc7ee644b Mon Sep 17 00:00:00 2001 From: Andrew Vasquez Date: Tue, 4 May 2010 15:01:21 -0700 Subject: [PATCH] --- yaml --- r: 195691 b: refs/heads/master c: 0b9dae6aeb0e5397b426e135509046b323740fd5 h: refs/heads/master i: 195689: 80aff36fd7cbad83b6aef721501efe2d661847f4 195687: e2becc7454bdd8bb05c94fe105ecb860bb47181c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_attr.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d740ea8e76b6..8ac7cd29a9af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1de6ab79456724d316d5dfa4bbb28f166cda99e +refs/heads/master: 0b9dae6aeb0e5397b426e135509046b323740fd5 diff --git a/trunk/drivers/scsi/qla2xxx/qla_attr.c b/trunk/drivers/scsi/qla2xxx/qla_attr.c index c272af4a76e4..d416c3599e38 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_attr.c +++ b/trunk/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",