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

Commit 2e668962 authored by Ian Armstrong's avatar Ian Armstrong Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9190): ivtv: yuv write() error handling tweak 



Modifies behaviour of a failed dma write() operation for the yuv device.
If the dma transfer for the yuv device fails, the write() operation will now
exit immediately.

Signed-off-by: default avatarIan Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 26e9a397

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

+8 −7
Original line number Diff line number Diff line
@@ -600,13 +600,14 @@ retry: 
	since we may get here before the stream has been fully set-up */

	if (mode == OUT_YUV && s->q_full.length == 0 && itv->dma_data_req_size) {

		while (count >= itv->dma_data_req_size) {

			if (!ivtv_yuv_udma_stream_frame (itv, (void __user *)user_buf)) {

			rc = ivtv_yuv_udma_stream_frame(itv, (void __user *)user_buf);



			if (rc < 0)

				return rc;



			bytes_written += itv->dma_data_req_size;

			user_buf += itv->dma_data_req_size;

			count -= itv->dma_data_req_size;

			} else {

				break;

			}

		}

		if (count == 0) {

			IVTV_DEBUG_HI_FILE("Wrote %d bytes to %s (%d)\n", bytes_written, s->name, s->q_full.bytesused);