aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:38:16 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:26 -0500
commitfeff0485ebcf05b5af8a3c82aa5c361d9f8b6e75 (patch)
tree4e62185a0239eea1a12c57332e8027ceb780aa2c /drivers
parent45632c4f835e74f937d8632f7ba2dd49aa39c476 (diff)
[PATCH] v4l: 864: improved isoc error detection
- Improved isoc error detection. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 263b6c91adb5..442d50d7f320 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -573,8 +573,16 @@ static inline void em2820_isoc_video_copy(struct em2820 *dev,
573 573
574 if ((*f)->fieldbytesused + len > dev->field_size) 574 if ((*f)->fieldbytesused + len > dev->field_size)
575 len =dev->field_size - (*f)->fieldbytesused; 575 len =dev->field_size - (*f)->fieldbytesused;
576
577 if (buf[0] != 0x88 && buf[0] != 0x22) {
578 em2820_isocdbg("frame is not complete\n");
579 startread = buf;
580 len+=4;
581 } else
582 startread = buf + 4;
583
576 remain = len; 584 remain = len;
577 startread = buf + 4; 585
578 if ((*f)->top_field) 586 if ((*f)->top_field)
579 fieldstart = (*f)->bufmem; 587 fieldstart = (*f)->bufmem;
580 else 588 else
@@ -653,7 +661,8 @@ void em2820_isocIrq(struct urb *urb, struct pt_regs *regs)
653 em2820_isocdbg("data error: [%d] len=%d, status=%d", i, 661 em2820_isocdbg("data error: [%d] len=%d, status=%d", i,
654 urb->iso_frame_desc[i].actual_length, 662 urb->iso_frame_desc[i].actual_length,
655 urb->iso_frame_desc[i].status); 663 urb->iso_frame_desc[i].status);
656 continue; 664 if (urb->iso_frame_desc[i].status != -EPROTO)
665 continue;
657 } 666 }
658 if (urb->iso_frame_desc[i].actual_length <= 0) { 667 if (urb->iso_frame_desc[i].actual_length <= 0) {
659 em2820_isocdbg("packet %d is empty",i); 668 em2820_isocdbg("packet %d is empty",i);