diff --git a/[refs] b/[refs]
index 3ac116f0c948..f8bcf18892e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0306bfa011d86899f3e88d35b6ffe525271bafc
+refs/heads/master: 0a32ef3fc81fcebf679139534a9f806cb9ff538c
diff --git a/trunk/drivers/media/video/gspca/mars.c b/trunk/drivers/media/video/gspca/mars.c
index e85ba1aa8bd3..1eeac4041a61 100644
--- a/trunk/drivers/media/video/gspca/mars.c
+++ b/trunk/drivers/media/video/gspca/mars.c
@@ -325,12 +325,12 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 				PDEBUG(D_PACK, "sof offset: %d len: %d",
 					p, len);
 				frame = gspca_frame_add(gspca_dev, LAST_PACKET,
-							frame, data, 0);
+							frame, data, p);
 
 				/* put the JPEG header */
 				jpeg_put_header(gspca_dev, frame, 0x21);
-				data += 16;
-				len -= 16;
+				data += p + 16;
+				len -= p + 16;
 				break;
 			}
 		}