diff options
| author | Kalle Valo <kvalo@kernel.org> | 2022-10-29 08:25:50 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-10-29 08:25:50 +0300 |
| commit | a9501019f2de706eb43b59d66dcde70a23440cd3 (patch) | |
| tree | faf4f1b8a7c8bc9eed229ac690bcb953fd604995 /drivers/net/wireless/ath/ar5523 | |
| parent | 637639cbfebb747406b9a57befc0b347057a3a24 (diff) | |
| parent | f3ca72b0327101a074a871539e61775d43908ca4 (diff) | |
| download | linux-stable-a9501019f2de706eb43b59d66dcde70a23440cd3.tar.gz linux-stable-a9501019f2de706eb43b59d66dcde70a23440cd3.tar.bz2 linux-stable-a9501019f2de706eb43b59d66dcde70a23440cd3.zip | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v6.2. Major changes:
ath11k
* support configuring channel dwell time during scan
Diffstat (limited to 'drivers/net/wireless/ath/ar5523')
| -rw-r--r-- | drivers/net/wireless/ath/ar5523/ar5523.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c index a184c09d2f0f..19f61225a708 100644 --- a/drivers/net/wireless/ath/ar5523/ar5523.c +++ b/drivers/net/wireless/ath/ar5523/ar5523.c @@ -241,6 +241,11 @@ static void ar5523_cmd_tx_cb(struct urb *urb) } } +static void ar5523_cancel_tx_cmd(struct ar5523 *ar) +{ + usb_kill_urb(ar->tx_cmd.urb_tx); +} + static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata, int ilen, void *odata, int olen, int flags) { @@ -280,6 +285,7 @@ static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata, } if (!wait_for_completion_timeout(&cmd->done, 2 * HZ)) { + ar5523_cancel_tx_cmd(ar); cmd->odata = NULL; ar5523_err(ar, "timeout waiting for command %02x reply\n", code); |