aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/spca561.c6
-rw-r--r--include/linux/videodev2.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index a94e6270115e..dbd1648a655f 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -98,8 +98,8 @@ static struct ctrl sd_ctrls[] = {
98}; 98};
99 99
100static struct cam_mode sif_mode[] = { 100static struct cam_mode sif_mode[] = {
101 {V4L2_PIX_FMT_SPCA561, 160, 120, 3}, 101 {V4L2_PIX_FMT_SGBRG8, 160, 120, 3},
102 {V4L2_PIX_FMT_SPCA561, 176, 144, 2}, 102 {V4L2_PIX_FMT_SGBRG8, 176, 144, 2},
103 {V4L2_PIX_FMT_SPCA561, 320, 240, 1}, 103 {V4L2_PIX_FMT_SPCA561, 320, 240, 1},
104 {V4L2_PIX_FMT_SPCA561, 352, 288, 0}, 104 {V4L2_PIX_FMT_SPCA561, 352, 288, 0},
105}; 105};
@@ -808,7 +808,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
808 gspca_frame_add(gspca_dev, FIRST_PACKET, 808 gspca_frame_add(gspca_dev, FIRST_PACKET,
809 frame, data, len); 809 frame, data, len);
810 } else { 810 } else {
811 /*fixme: which format?*/ 811 /* raw bayer (with a header, which we skip) */
812 data += 20; 812 data += 20;
813 len -= 20; 813 len -= 20;
814 gspca_frame_add(gspca_dev, FIRST_PACKET, 814 gspca_frame_add(gspca_dev, FIRST_PACKET,
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 43a6c81a53ef..577f15634791 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -310,6 +310,7 @@ struct v4l2_pix_format
310 310
311/* see http://www.siliconimaging.com/RGB%20Bayer.htm */ 311/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
312#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */ 312#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */
313#define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G','B','R','G') /* 8 GBGB.. RGRG.. */
313#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B','Y','R','2') /* 16 BGBG.. GRGR.. */ 314#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B','Y','R','2') /* 16 BGBG.. GRGR.. */
314 315
315/* compressed formats */ 316/* compressed formats */