diff options
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-core.c | 13 | ||||
| -rw-r--r-- | linux/drivers/usb/media/em2820-core.c | 13 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 31 insertions, 4 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c index 1dc2a16d9..ce110cc96 100644 --- a/linux/drivers/media/video/em28xx/em28xx-core.c +++ b/linux/drivers/media/video/em28xx/em28xx-core.c @@ -581,8 +581,16 @@ static inline void em2820_isoc_video_copy(struct em2820 *dev, if ((*f)->fieldbytesused + len > dev->field_size) len =dev->field_size - (*f)->fieldbytesused; + + if (buf[0] != 0x88 && buf[0] != 0x22) { + em2820_isocdbg("frame is not complete\n"); + startread = buf; + len+=4; + } else + startread = buf + 4; + remain = len; - startread = buf + 4; + if ((*f)->top_field) fieldstart = (*f)->bufmem; else @@ -661,7 +669,8 @@ void em2820_isocIrq(struct urb *urb, struct pt_regs *regs) em2820_isocdbg("data error: [%d] len=%d, status=%d", i, urb->iso_frame_desc[i].actual_length, urb->iso_frame_desc[i].status); - continue; + if (urb->iso_frame_desc[i].status != -EPROTO) + continue; } if (urb->iso_frame_desc[i].actual_length <= 0) { em2820_isocdbg("packet %d is empty",i); diff --git a/linux/drivers/usb/media/em2820-core.c b/linux/drivers/usb/media/em2820-core.c index 1dc2a16d9..ce110cc96 100644 --- a/linux/drivers/usb/media/em2820-core.c +++ b/linux/drivers/usb/media/em2820-core.c @@ -581,8 +581,16 @@ static inline void em2820_isoc_video_copy(struct em2820 *dev, if ((*f)->fieldbytesused + len > dev->field_size) len =dev->field_size - (*f)->fieldbytesused; + + if (buf[0] != 0x88 && buf[0] != 0x22) { + em2820_isocdbg("frame is not complete\n"); + startread = buf; + len+=4; + } else + startread = buf + 4; + remain = len; - startread = buf + 4; + if ((*f)->top_field) fieldstart = (*f)->bufmem; else @@ -661,7 +669,8 @@ void em2820_isocIrq(struct urb *urb, struct pt_regs *regs) em2820_isocdbg("data error: [%d] len=%d, status=%d", i, urb->iso_frame_desc[i].actual_length, urb->iso_frame_desc[i].status); - continue; + if (urb->iso_frame_desc[i].status != -EPROTO) + continue; } if (urb->iso_frame_desc[i].actual_length <= 0) { em2820_isocdbg("packet %d is empty",i); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index f49978ec6..bf6e6b870 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-10-26 12:59 mchehab + + * ../linux/drivers/usb/media/em2820-core.c: + (em2820_isoc_video_copy), (em2820_isocIrq): + - Improved isoc error detection. + + Thanks-to: Stefan Kristiansson <stefan@langante.mine.nu> + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-10-26 12:31 mchehab * ../linux/Documentation/video4linux/CARDLIST.em2820: |