Merge branch 'misc' into for-linus

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / ufs / ufshcd.c

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index af7e0285f00423a78b4ab6f99e967b6e9ce6a5e5..a2c2817fc566911e59f019d91639260d2df2fa09 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5861,7 +5861,7 @@ ufshcd_send_request_sense(struct ufs_hba *hba, struct scsi_device *sdp)
 
        ret = scsi_execute_req_flags(sdp, cmd, DMA_FROM_DEVICE, buffer,
                                UFSHCD_REQ_SENSE_SIZE, NULL,
-                               msecs_to_jiffies(1000), 3, NULL, REQ_PM);
+                               msecs_to_jiffies(1000), 3, NULL, 0, RQF_PM);
        if (ret)
                pr_err("%s: failed with err %d\n", __func__, ret);
 
@@ -5923,11 +5923,11 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
 
        /*
         * Current function would be generally called from the power management
-        * callbacks hence set the REQ_PM flag so that it doesn't resume the
+        * callbacks hence set the RQF_PM flag so that it doesn't resume the
         * already suspended childs.
         */
        ret = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
-                                    START_STOP_TIMEOUT, 0, NULL, REQ_PM);
+                                    START_STOP_TIMEOUT, 0, NULL, 0, RQF_PM);
        if (ret) {
                sdev_printk(KERN_WARNING, sdp,
                            "START_STOP failed for power mode: %d, result %x\n",