From ba64dec0529d696599a340bda8fc48e747062f67 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 5 Oct 2013 16:23:21 +0000 Subject: [PATCH] qla2x00t: Remove a superfluous pair of braces since checkpatch complains about these (merge r3946 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@5028 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla2x00-target/qla2x00t.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c index fbb626d97..f5c61848d 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.c +++ b/qla2x00t/qla2x00-target/qla2x00t.c @@ -2589,16 +2589,14 @@ static void q2x_init_ctio_ret_entry(ctio_ret_entry_t *ctio_m1, ctio_m1->flags = cpu_to_le16(OF_SSTS | OF_FAST_POST | OF_NO_DATA | OF_SS_MODE_1); ctio_m1->flags |= cpu_to_le16(OF_INC_RC); - if (q2t_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) { + if (q2t_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) ctio_m1->flags |= cpu_to_le16(OF_EXPL_CONF | OF_CONF_REQ); - } + ctio_m1->scsi_status = cpu_to_le16(prm->rq_result); ctio_m1->residual = cpu_to_le32(prm->residual); if (SCST_SENSE_VALID(prm->sense_buffer)) { - if (q2t_need_explicit_conf(prm->tgt->ha, prm->cmd, 1)) { - ctio_m1->flags |= cpu_to_le16(OF_EXPL_CONF | - OF_CONF_REQ); - } + if (q2t_need_explicit_conf(prm->tgt->ha, prm->cmd, 1)) + ctio_m1->flags |= cpu_to_le16(OF_EXPL_CONF | OF_CONF_REQ); ctio_m1->scsi_status |= cpu_to_le16(SS_SENSE_LEN_VALID); ctio_m1->sense_length = cpu_to_le16(prm->sense_buffer_len); memcpy(ctio_m1->sense_data, prm->sense_buffer,