diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-18 06:38:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-18 06:38:22 -0800 |
| commit | fb033a4afdbe0610a35e0be74429c9851c382966 (patch) | |
| tree | fce35ec78d114415b10d702c3fbc222c5f2861a7 /drivers | |
| parent | 8020c4ccfc41edad917c9abc3b39063f169e879c (diff) | |
| parent | a723713f60c83eb1964cf326214a4b9b54e077c1 (diff) | |
Merge "scsi: ufs: full reinit upon resume if link was off"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index f5d7cd0f4701..c891fc8d34a3 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8603,9 +8603,13 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) goto vendor_suspend; } } else if (ufshcd_is_link_off(hba)) { - ret = ufshcd_host_reset_and_restore(hba); /* - * ufshcd_host_reset_and_restore() should have already + * A full initialization of the host and the device is required + * since the link was put to off during suspend. + */ + ret = ufshcd_reset_and_restore(hba); + /* + * ufshcd_reset_and_restore() should have already * set the link state as active */ if (ret || !ufshcd_is_link_active(hba)) |