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: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index b7457fc60ba5964c5131cc5282c1b2f29f831411..1c404e454a36f6c601550fd261e2cc65e42805ec 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -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)) {
-                               bytes_written += itv->dma_data_req_size;
-                               user_buf += itv->dma_data_req_size;
-                               count -= itv->dma_data_req_size;
-                       } else {
-                               break;
-                       }
+                       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;
                }
                if (count == 0) {
                        IVTV_DEBUG_HI_FILE("Wrote %d bytes to %s (%d)\n", bytes_written, s->name, s->q_full.bytesused);