Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a859e09 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
Cc: linux-media@vger.kernel.org
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ce0ede2c

drivers/media/platform/omap/omap_vout_vrfb.c

+2 −1
Original line number Diff line number Diff line
@@ -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);