Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[sfrench/cifs-2.6.git] / drivers / scsi / qla2xxx / qla_bsg.c

diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 975e7a1175329d81701fe266f10a84de564f9664..84c9098cc089fc599774dfc82dc029895d229060 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -918,7 +918,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 
        bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
            sizeof(response) + sizeof(uint8_t);
 
        bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
            sizeof(response) + sizeof(uint8_t);

-       fw_sts_ptr = ((uint8_t *)bsg_job->req->sense) +
+       fw_sts_ptr = ((uint8_t *)scsi_req(bsg_job->req)->sense) +

            sizeof(struct fc_bsg_reply);
        memcpy(fw_sts_ptr, response, sizeof(response));
        fw_sts_ptr += sizeof(response);
            sizeof(struct fc_bsg_reply);
        memcpy(fw_sts_ptr, response, sizeof(response));
        fw_sts_ptr += sizeof(response);