diff --git a/[refs] b/[refs]
index e2f0f9de5149..cac1663f2dc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 585a8a59ebfc81327e1c4f2c0e80730bdd2e5d8e
+refs/heads/master: 66dbfbe6fde35c881deda5cebb6ecaa0dcc1c975
diff --git a/trunk/drivers/scsi/lpfc/lpfc_scsi.c b/trunk/drivers/scsi/lpfc/lpfc_scsi.c
index 94458d7a8f7f..17d7dc05149b 100644
--- a/trunk/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/trunk/drivers/scsi/lpfc/lpfc_scsi.c
@@ -499,7 +499,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
 					 "0717 FCP command x%x residual "
 					 "underrun converted to error "
 					 "Data: x%x x%x x%x\n",
-					 cmnd->cmnd[0], cmnd->request_bufflen,
+					 cmnd->cmnd[0], scsi_bufflen(cmnd),
 					 scsi_get_resid(cmnd), cmnd->underflow);
 			host_status = DID_ERROR;
 		}