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

Commit 90851fe9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5843): ivtv: fix missing signal_pending check. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f8859691

drivers/media/video/ivtv/ivtv-streams.c

+1 −4
Original line number Diff line number Diff line
@@ -807,7 +807,6 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end) 
		then = jiffies;

		/* Make sure DMA is complete */

		add_wait_queue(&s->waitq, &wait);

		set_current_state(TASK_INTERRUPTIBLE);

		do {

			/* check if DMA is pending */

			if ((s->type == IVTV_ENC_STREAM_TYPE_MPG) &&	/* MPG Only */
@@ -822,9 +821,7 @@ int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end) 
			} else if (read_reg(IVTV_REG_DMASTATUS) & 0x02) {

				break;

			}



			ivtv_sleep_timeout(HZ / 100, 1);

		} while (then + HZ * 2 > jiffies);

		} while (!ivtv_sleep_timeout(HZ / 100, 1) && then + HZ * 2 > jiffies);



		set_current_state(TASK_RUNNING);

		remove_wait_queue(&s->waitq, &wait);