diff options
| author | Arnd Bergmann | 2014-01-02 13:07:29 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-02-28 18:31:02 +0100 |
| commit | 6a859e09c40f09fd77411ca46d8b6ca1c08444fe (patch) | |
| tree | ee0c8a997565476603fd0cb7e5367e89b130dabc /drivers/media/platform/omap | |
| parent | [media] radio-cadet: avoid interruptible_sleep_on race (diff) | |
| download | kernel-qcow2-linux-6a859e09c40f09fd77411ca46d8b6ca1c08444fe.tar.gz kernel-qcow2-linux-6a859e09c40f09fd77411ca46d8b6ca1c08444fe.tar.xz kernel-qcow2-linux-6a859e09c40f09fd77411ca46d8b6ca1c08444fe.zip | |
[media] omap_vout: avoid sleep_on race
sleep_on and its variants are broken and going away soon. This changes
the omap vout driver to use wait_event_interruptible_timeout instead,
which fixes potential race where the dma is complete before we
schedule.
[hans.verkuil@cisco.com: replaced interruptible_sleep_on_timeout by
wait_event_interruptible_timeout in the commit msg, obvious typo]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: linux-media@vger.kernel.org
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/omap')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout_vrfb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/omap/omap_vout_vrfb.c b/drivers/media/platform/omap/omap_vout_vrfb.c index cf1c437a8687..62e7e5783ce8 100644 --- a/drivers/media/platform/omap/omap_vout_vrfb.c +++ b/drivers/media/platform/omap/omap_vout_vrfb.c @@ -270,7 +270,8 @@ int omap_vout_prepare_vrfb(struct omap_vout_device *vout, omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, 0x20, 0); omap_start_dma(tx->dma_ch); - interruptible_sleep_on_timeout(&tx->wait, VRFB_TX_TIMEOUT); + wait_event_interruptible_timeout(tx->wait, tx->tx_status == 1, + VRFB_TX_TIMEOUT); if (tx->tx_status == 0) { omap_stop_dma(tx->dma_ch); |