diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 17:24:32 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 17:36:40 +0200 |
| commit | 02f7415054d7054955fd3c43902ad79437b09fbc (patch) | |
| tree | 87a7def48bbe373a820109805b974b53b1d382fa /drivers/scsi/ufs/ufs-mediatek.c | |
| parent | scsi: lpfc: Remove set but not used 'qp' (diff) | |
| parent | scsi: libsas: Fix error path in sas_notify_lldd_dev_found() (diff) | |
| download | linux-02f7415054d7054955fd3c43902ad79437b09fbc.tar.xz linux-02f7415054d7054955fd3c43902ad79437b09fbc.zip | |
Merge branch '5.9/scsi-fixes' into 5.10/scsi-ufs
Resolve UFS discrepancies between fixes and queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/ufs/ufs-mediatek.c')
| -rw-r--r-- | drivers/scsi/ufs/ufs-mediatek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufs-mediatek.c b/drivers/scsi/ufs/ufs-mediatek.c index 3ec44dfa2567..ab65d1552bb8 100644 --- a/drivers/scsi/ufs/ufs-mediatek.c +++ b/drivers/scsi/ufs/ufs-mediatek.c @@ -257,7 +257,7 @@ static int ufs_mtk_wait_link_state(struct ufs_hba *hba, u32 state, ktime_t timeout, time_checked; u32 val; - timeout = ktime_add_us(ktime_get(), ms_to_ktime(max_wait_ms)); + timeout = ktime_add_ms(ktime_get(), max_wait_ms); do { time_checked = ktime_get(); ufshcd_writel(hba, 0x20, REG_UFS_DEBUG_SEL); |