On 5/22/10 1:18 PM, "Dan Carpenter" <error27@xxxxxxxxx> wrote: > We assume that "ha->cs84xx" can be null on the previous line, so we > should check it here as well. > > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> > > diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c > index 3b70860..ad22baa 100644 > --- a/drivers/scsi/qla2xxx/qla_attr.c > +++ b/drivers/scsi/qla2xxx/qla_attr.c > @@ -1211,7 +1211,7 @@ qla24xx_84xx_fw_version_show(struct device *dev, > if (ha->cs84xx && ha->cs84xx->op_fw_version == 0) > rval = qla84xx_verify_chip(vha, status); > > - if ((rval == QLA_SUCCESS) && (status[0] == 0)) > + if (ha->cs84xx && rval == QLA_SUCCESS && status[0] == 0) > return snprintf(buf, PAGE_SIZE, "%u\n", > (uint32_t)ha->cs84xx->op_fw_version); > The checking for ha->cs84xx is redundant here since earlier check make sure that this code does not execute for non ISP 84xx ISPs. I will cleanup and resubmit the changes. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
