]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtw88: Use udelay instead of usleep in atomic context
authorKai-Heng Feng <kai.heng.feng@canonical.com>
Thu, 23 Apr 2020 07:30:07 +0000 (15:30 +0800)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 6 May 2020 08:30:34 +0000 (11:30 +0300)
It's incorrect to use usleep in atomic context.

Switch to a macro which uses udelay instead of usleep to prevent the issue.

Fixes: 6343a6d4b213 ("rtw88: Add delay on polling h2c command status bit")
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200423073007.3566-1-kai.heng.feng@canonical.com
drivers/net/wireless/realtek/rtw88/fw.c

index dde7823143ea8b3cb9e192d8a82dafec2af68e7e..5e981fdeee3c3932aeec370b3538888eed647918 100644 (file)
@@ -228,9 +228,9 @@ static void rtw_fw_send_h2c_command(struct rtw_dev *rtwdev,
                goto out;
        }
 
-       ret = read_poll_timeout(rtw_read8, box_state,
-                               !((box_state >> box) & 0x1), 100, 3000, false,
-                               rtwdev, REG_HMETFR);
+       ret = read_poll_timeout_atomic(rtw_read8, box_state,
+                                      !((box_state >> box) & 0x1), 100, 3000,
+                                      false, rtwdev, REG_HMETFR);
 
        if (ret) {
                rtw_err(rtwdev, "failed to send h2c command\n");