Merge branch 'master' into for-next

[pandora-kernel.git] / drivers / scsi / qla2xxx / qla_isr.c

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d17ed9a..6c55c3c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -414,7 +414,7 @@ skip_rio:
                                    "marked OFFLINE!\n");
                                vha->flags.online = 0;
                        } else {
-                               /* Check to see if MPI timeout occured */
+                               /* Check to see if MPI timeout occurred */
                                if ((mbx & MBX_3) && (ha->flags.port0))
                                        set_bit(MPI_RESET_NEEDED,
                                            &vha->dpc_flags);
@@ -1051,7 +1051,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                }
                DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
        } else {
-               bsg_job->reply->result =  DID_OK << 16;;
+               bsg_job->reply->result =  DID_OK << 16;
                bsg_job->reply->reply_payload_rcv_len =
                    bsg_job->reply_payload.payload_len;
                bsg_job->reply_len = 0;
@@ -1146,7 +1146,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
                DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
        }
        else {
-               bsg_job->reply->result =  DID_OK << 16;;
+               bsg_job->reply->result =  DID_OK << 16;
                bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
                bsg_job->reply_len = 0;
        }