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

Commit 3f84307a authored by Adrian Bunk's avatar Adrian Bunk Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6803): buf-core.c locking fixes 



After commit 19fb1457 the callers in
videobuf-core.c that already hold the lock must call
__videobuf_read_start() instead of videobuf_read_start().

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent da8cadb3

drivers/media/video/videobuf-core.c

+2 −2
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ ssize_t videobuf_read_stream(struct videobuf_queue *q, 
	if (q->streaming)

		goto done;

	if (!q->reading) {

		retval = videobuf_read_start(q);

		retval = __videobuf_read_start(q);

		if (retval < 0)

			goto done;

	}
@@ -982,7 +982,7 @@ unsigned int videobuf_poll_stream(struct file *file, 
					 struct videobuf_buffer, stream);

	} else {

		if (!q->reading)

			videobuf_read_start(q);

			__videobuf_read_start(q);

		if (!q->reading) {

			rc = POLLERR;

		} else if (NULL == q->read_buf) {