Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / drivers / scsi / qla2xxx / qla_bsg.c

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index b989add77ec3977f6c379f28ddb3d89be757bcc9..aa57bf0af574e872ab6e00dae36f7fe4df1a2199 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -1895,7 +1895,7 @@ done:
        bsg_job->reply->reply_payload_rcv_len = 0;
        bsg_job->reply->result = (DID_OK) << 16;
        bsg_job->job_done(bsg_job);
-       /* Always retrun success, vendor rsp carries correct status */
+       /* Always return success, vendor rsp carries correct status */
        return 0;
 }