From: Chad Dupuis <chad.dupuis@qlogic.com>
Date: Thu, 20 Sep 2012 00:06:24 +0000 (+0530)
Subject: qla2xxx: Fix checkpatch error in qla2xxx_mctp_dump.
X-Git-Tag: v2.6.39-400.9.0~37^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9a34022498f19a5979da6f22b6cd068e955877ec;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Fix checkpatch error in qla2xxx_mctp_dump.

Fix checkpatch.pl violation where an assignment is done directly in a if
statement.

JIRA Key: V2632FC-276

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Armen Baloyan <armen.baloyan@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7067d3837311b..e7436b8b114b2 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4116,7 +4116,8 @@ qla2xxx_mctp_dump(scsi_qla_host_t *vha)
 
         if (!ha->flags.nic_core_reset_hdlr_active && !ha->portnum) {
                 ha->flags.nic_core_reset_hdlr_active = 1;
-                if ((rval = qla83xx_restart_nic_firmware(vha)))
+		rval = qla83xx_restart_nic_firmware(vha);
+		if (rval)
                         /* NIC Core reset failed. */
 			ql_log(ql_log_warn, vha, 0x5071,
 			    "Failed to restart nic firmware\n");