From 8981505eac23b310e92a5e83efe80553eef91cab Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 4 Nov 2018 04:35:03 +0000
Subject: [PATCH] Merge r7457 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7710 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t/qla_init.c | 3 +--
 qla2x00t/qla_isr.c  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/qla2x00t/qla_init.c b/qla2x00t/qla_init.c
index 03b8e5886..27f92217b 100644
--- a/qla2x00t/qla_init.c
+++ b/qla2x00t/qla_init.c
@@ -987,8 +987,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
 			if (++abts_cnt < 5) {
 				set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
 				set_bit(MPI_RESET_NEEDED, &vha->dpc_flags);
-			}
-			else {
+			} else {
 				/*
 				 * We exhausted the ISP abort retries. We have to
 				 * set the board offline.
diff --git a/qla2x00t/qla_isr.c b/qla2x00t/qla_isr.c
index 5cfd038a9..23f6f8073 100644
--- a/qla2x00t/qla_isr.c
+++ b/qla2x00t/qla_isr.c
@@ -1252,8 +1252,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 		}
 		ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,
 				(uint8_t *)pkt, sizeof(*pkt));
-	}
-	else {
+	} else {
 #ifndef NEW_LIBFC_API
 		bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
 #else