Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / libfc / fc_lport.c

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 919736a74ffa6e8b46e1f87b042968f42eae71b8..aa76f36abe030eb4db330e8ba03115e9a0909a13 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -2095,7 +2095,7 @@ int fc_lport_bsg_request(struct bsg_job *job)
 
        bsg_reply->reply_payload_rcv_len = 0;
        if (rsp)
-               rsp->resid_len = job->reply_payload.payload_len;
+               scsi_req(rsp)->resid_len = job->reply_payload.payload_len;
 
        mutex_lock(&lport->lp_mutex);