---

yaml --- r: 13409 b: refs/heads/master c: feff048 h: refs/heads/master i: 13407: 675efe5 v: v3
git-mirror · Nov 9, 2005 · ae43e54 · ae43e54
1 parent 9d8799b
commit ae43e54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45632c4f835e74f937d8632f7ba2dd49aa39c476
+refs/heads/master: feff0485ebcf05b5af8a3c82aa5c361d9f8b6e75
diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c
@@ -573,8 +573,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
@@ -653,7 +661,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);