Merge patch series "scsi: pm8001: Bug fix and cleanup"

[linux-2.6-block.git] / drivers / ufs / core / ufshcd.c

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index c2df07545f966bb566846341bdafabb6ead242ad..5f874c685f8d019de4c32ca35d22a61e1032079a 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -447,8 +447,8 @@ static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
        } else {
                doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
        }
-       trace_ufshcd_command(dev_name(hba->dev), str_t, tag,
-                       doorbell, hwq_id, transfer_len, intr, lba, opcode, group_id);
+       trace_ufshcd_command(cmd->device, str_t, tag, doorbell, hwq_id,
+                            transfer_len, intr, lba, opcode, group_id);
 }
 
 static void ufshcd_print_clk_freqs(struct ufs_hba *hba)
@@ -8723,7 +8723,8 @@ static int ufshcd_probe_hba(struct ufs_hba *hba, bool init_dev_params)
        if (ret)
                goto out;
 
-       if (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH) {
+       if (!hba->pm_op_in_progress &&
+           (hba->quirks & UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH)) {
                /* Reset the device and controller before doing reinit */
                ufshcd_device_reset(hba);
                ufshcd_hba_stop(hba);