forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Ian Armstrong 2008-10-11 06:39:05 -03:00 • committed by Mauro Carvalho Chehab
commit 2e668962a5
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/media/video/ivtv/ivtv-fileops.c
View file

@ -600,13 +600,14 @@ retry:
since we may get here before the stream has been fully set-up */ 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) { if (mode == OUT_YUV && s->q_full.length == 0 && itv->dma_data_req_size) {
while (count >= 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);
bytes_written += itv->dma_data_req_size;
user_buf += itv->dma_data_req_size; if (rc < 0)
count -= itv->dma_data_req_size; return rc;
} else {
break; bytes_written += itv->dma_data_req_size;
} user_buf += itv->dma_data_req_size;
count -= itv->dma_data_req_size;
} }
if (count == 0) { if (count == 0) {
IVTV_DEBUG_HI_FILE("Wrote %d bytes to %s (%d)\n", bytes_written, s->name, s->q_full.bytesused); IVTV_DEBUG_HI_FILE("Wrote %d bytes to %s (%d)\n", bytes_written, s->name, s->q_full.bytesused);