Commit 9b2bf294 authored by Wolfram Sang's avatar Wolfram Sang Committed by Hans Verkuil
Browse files

media: bdisp: use 'time_left' variable with wait_event_timeout() 



There is a confusing pattern in the kernel to use a variable named
'timeout' to store the result of wait_event_timeout() causing
patterns like:

        timeout = wait_event_timeout(...)
        if (!timeout) return -ETIMEDOUT;

with all kinds of permutations. Use 'time_left' as a variable to make the
code self explaining.

Fix to the proper variable type 'long' while here.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 64979ac2

drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c

+5 −5
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static void bdisp_irq_timeout(struct work_struct *ptr) 
static int bdisp_m2m_suspend(struct bdisp_dev *bdisp)

{

	unsigned long flags;

	int timeout;

	long time_left;



	spin_lock_irqsave(&bdisp->slock, flags);

	if (!test_bit(ST_M2M_RUNNING, &bdisp->state)) {
@@ -1171,13 +1171,13 @@ static int bdisp_m2m_suspend(struct bdisp_dev *bdisp) 
	set_bit(ST_M2M_SUSPENDING, &bdisp->state);

	spin_unlock_irqrestore(&bdisp->slock, flags);



	timeout = wait_event_timeout(bdisp->irq_queue,

	time_left = wait_event_timeout(bdisp->irq_queue,

				       test_bit(ST_M2M_SUSPENDED, &bdisp->state),

				       BDISP_WORK_TIMEOUT);



	clear_bit(ST_M2M_SUSPENDING, &bdisp->state);



	if (!timeout) {

	if (!time_left) {

		dev_err(bdisp->dev, "%s IRQ timeout\n", __func__);

		return -EAGAIN;

	}