diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-23 11:02:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-23 11:02:42 -0700 |
| commit | 0e36fd45e37e0b4151d70cfae4d7e3e9a75c5c99 (patch) | |
| tree | 370acba9beb8873ae261a7e25307bc6719678c31 /drivers/misc/cardreader/rtsx_pcr.c | |
| parent | 8f261041b18ee80ad8afdd1621c909c4df9f6cc3 (diff) | |
| parent | 7a839dbab1be59f5ed3b3b046de29e166784c9b4 (diff) | |
Merge tag 'char-misc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc fixes from Greg KH:
"Here are some small char/misc driver fixes for 5.7-rc7 that resolve
some reported issues. Included in here are tiny fixes for the mei,
coresight, rtsx, ipack, and mhi drivers.
All of these have been in linux-next with no reported issues"
* tag 'char-misc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
misc: rtsx: Add short delay after exit from ASPM
bus: mhi: core: Fix some error return code
ipack: tpci200: fix error return code in tpci200_register()
coresight: cti: remove incorrect NULL return check
mei: release me_cl object reference
Diffstat (limited to 'drivers/misc/cardreader/rtsx_pcr.c')
| -rw-r--r-- | drivers/misc/cardreader/rtsx_pcr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index 06038b325b02..55da6428ceb0 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -142,6 +142,9 @@ static void rtsx_comm_pm_full_on(struct rtsx_pcr *pcr) rtsx_disable_aspm(pcr); + /* Fixes DMA transfer timout issue after disabling ASPM on RTS5260 */ + msleep(1); + if (option->ltr_enabled) rtsx_set_ltr_latency(pcr, option->ltr_active_latency); |