From e1b52669ad1272f9df9e40277a3160c70df94292 Mon Sep 17 00:00:00 2001
From: Theodore Kilgore <kilgota@auburn.edu>
Date: Fri, 13 Mar 2009 13:04:31 -0300
Subject: [PATCH] --- yaml --- r: 138161 b: refs/heads/master c:
 9832d765f82769799ba15ac9d2e8edf8f7de6898 h: refs/heads/master i:   138159:
 1ea6ecc1c732612e0da4001d2e8ead7b0186fad4 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/video/gspca/mr97310a.c | 22 +++-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index d5cab8c35c7e..ea54aeb070a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f9cd8f18c7faabf6dc144c198f6ee30429d3da0
+refs/heads/master: 9832d765f82769799ba15ac9d2e8edf8f7de6898
diff --git a/trunk/drivers/media/video/gspca/mr97310a.c b/trunk/drivers/media/video/gspca/mr97310a.c
index 5ec5ce6e3ed9..2a901a4a6f00 100644
--- a/trunk/drivers/media/video/gspca/mr97310a.c
+++ b/trunk/drivers/media/video/gspca/mr97310a.c
@@ -29,9 +29,7 @@ MODULE_LICENSE("GPL");
 /* specific webcam descriptor */
 struct sd {
 	struct gspca_dev gspca_dev;  /* !! must be the first item */
-
 	u8 sof_read;
-	u8 header_read;
 };
 
 /* V4L2 controls supported by the driver */
@@ -285,7 +283,6 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 			__u8 *data,                   /* isoc packet */
 			int len)                      /* iso packet length */
 {
-	struct sd *sd = (struct sd *) gspca_dev;
 	unsigned char *sof;
 
 	sof = pac_find_sof(gspca_dev, data, len);
@@ -300,25 +297,12 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 			n = 0;
 		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
 					data, n);
-		sd->header_read = 0;
-		gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0);
+		/* Start next frame. */
+		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
+			pac_sof_marker, sizeof pac_sof_marker);
 		len -= sof - data;
 		data = sof;
 	}
-	if (sd->header_read < 7) {
-		int needed;
-
-		/* skip the rest of the header */
-		needed = 7 - sd->header_read;
-		if (len <= needed) {
-			sd->header_read += len;
-			return;
-		}
-		data += needed;
-		len -= needed;
-		sd->header_read = 7;
-	}
-
 	gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }