aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/stk014.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/stk014.c')
-rw-r--r--drivers/media/video/gspca/stk014.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index d9d64911f22a..60de9af87fbb 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -109,7 +109,7 @@ static struct ctrl sd_ctrls[] = {
109 }, 109 },
110}; 110};
111 111
112static struct v4l2_pix_format vga_mode[] = { 112static const struct v4l2_pix_format vga_mode[] = {
113 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, 113 {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
114 .bytesperline = 320, 114 .bytesperline = 320,
115 .sizeimage = 320 * 240 * 3 / 8 + 590, 115 .sizeimage = 320 * 240 * 3 / 8 + 590,
@@ -424,10 +424,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
424 424
425 /* beginning of the frame */ 425 /* beginning of the frame */
426#define STKHDRSZ 12 426#define STKHDRSZ 12
427 gspca_frame_add(gspca_dev, INTER_PACKET, frame, 427 data += STKHDRSZ;
428 data + STKHDRSZ, len - STKHDRSZ); 428 len -= STKHDRSZ;
429#undef STKHDRSZ
430 return;
431 } 429 }
432 gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len); 430 gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
433} 431}