From: Chad Dupuis Date: Thu, 19 Jul 2012 08:17:34 +0000 (+0530) Subject: qla2xxx: More trivial fixups. X-Git-Tag: v2.6.39-400.9.0~468 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4370928ad85e20f3efb6906caaab144c29b0f94b;p=users%2Fjedix%2Flinux-maple.git qla2xxx: More trivial fixups. JIRA Key: V2632FC-183 Signed-off-by: Saurav Kashyap --- diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index c292e882e0aa..d449d958d4e7 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -501,7 +501,8 @@ skip_rio: case MBA_LOOP_DOWN: /* Loop Down Event */ mbx = (IS_QLA81XX(ha) || IS_QLA8031(ha)) ? RD_REG_WORD(®24->mailbox4) : 0; - mbx = IS_QLA82XX(ha) ? RD_REG_WORD(®82->mailbox_out[4]) : mbx; + mbx = IS_QLA82XX(ha) ? RD_REG_WORD(®82->mailbox_out[4]) + : mbx; ql_dbg(ql_dbg_async, vha, 0x500b, "LOOP DOWN detected (%x %x %x %x).\n", mb[1], mb[2], mb[3], mbx); @@ -1023,7 +1024,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req, ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035, (uint8_t *)pkt, sizeof(*pkt)); } else { - res = DID_OK << 16;; + res = DID_OK << 16; bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len; bsg_job->reply_len = 0; diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index eb8c73e71b1c..cd65d08eebb7 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c @@ -3980,7 +3980,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq, } /* Copy mailbox information */ - memcpy( mresp, mcp->mb, 64); + memcpy(mresp, mcp->mb, 64); return rval; }