diff options
| author |   Jérôme Pouiller <jerome.pouiller@silabs.com> | 2020-04-01 13:04:03 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-13 08:55:37 +0200 |
| commit | a39e761aa4fefa2a8aaf549217329933b91da7c9 (patch) | |
| tree | 98dd58f91701e6fe820adb2d38be3c9f4ed32b2d /drivers/staging/wfx/queue.c | |
| parent | staging: wfx: wfx_flush() did not ensure that frames are processed (diff) | |
| download | linux-dev-a39e761aa4fefa2a8aaf549217329933b91da7c9.tar.xz linux-dev-a39e761aa4fefa2a8aaf549217329933b91da7c9.zip | |
staging: wfx: fix potential deadlock in wfx_tx_flush()
wfx_tx_flush() wait there are no more frame in device buffer. However,
this event may never happens since wfx_tx_flush() don't forbid to
enqueue new frames.
Note that wfx_tx_flush() should only ensure that all frames currently in
hardware queues are sent. So the current code is more restrictive that
it should.
Note that wfx_tx_flush() release the lock before to return while
wfx_tx_lock_flush() keep the lock.
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-31-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wfx/queue.c')
| -rw-r--r-- | drivers/staging/wfx/queue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c index d4302a30dc41..e6d7d0e45156 100644 --- a/drivers/staging/wfx/queue.c +++ b/drivers/staging/wfx/queue.c @@ -36,6 +36,7 @@ void wfx_tx_flush(struct wfx_dev *wdev) if (wdev->chip_frozen) return; + wfx_tx_lock(wdev); mutex_lock(&wdev->hif_cmd.lock); ret = wait_event_timeout(wdev->hif.tx_buffers_empty, !wdev->hif.tx_buffers_used, @@ -54,6 +55,7 @@ void wfx_tx_flush(struct wfx_dev *wdev) wdev->chip_frozen = 1; } mutex_unlock(&wdev->hif_cmd.lock); + wfx_tx_unlock(wdev); } void wfx_tx_lock_flush(struct wfx_dev *wdev) |