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

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

[media] ivtv: only start streaming in poll() if polling for input 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 50953e06

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

+4 −2
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ unsigned int ivtv_v4l2_dec_poll(struct file *filp, poll_table *wait) 


unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table *wait)

{

	unsigned long req_events = poll_requested_events(wait);

	struct ivtv_open_id *id = fh2id(filp->private_data);

	struct ivtv *itv = id->itv;

	struct ivtv_stream *s = &itv->streams[id->type];
@@ -755,7 +756,8 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait) 
	unsigned res = 0;



	/* Start a capture if there is none */

	if (!eof && !test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {

	if (!eof && !test_bit(IVTV_F_S_STREAMING, &s->s_flags) &&

			(req_events & (POLLIN | POLLRDNORM))) {

		int rc;



		rc = ivtv_start_capture(id);