From: Márton Németh <nm...@freemail.hu>
Separate supported format descriptors and supported resolutions.
Signed-off-by: Márton Németh <nm...@freemail.hu>
Cc: Thomas Kaiser <tho...@kaiser-linux.li>
Cc: Theodore Kilgore <kilg...@auburn.edu>
Cc: Kyle Guinn <ely...@gmail.com>
---
diff -uprN q/drivers/media/video/gspca/pac7311.c
r/drivers/media/video/gspca/pac7311.c
--- q/drivers/media/video/gspca/pac7311.c 2009-10-31 08:26:17.000000000
+0100
+++ r/drivers/media/video/gspca/pac7311.c 2009-10-31 09:07:56.000000000
+0100
@@ -349,7 +349,15 @@ static struct ctrl pac7311_sd_ctrls[] =
},
};
-static const struct v4l2_pix_format vga_mode[] = {
+static const struct v4l2_pix_format pac7302_vga_mode[] = {
+ {640, 480, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
+ .bytesperline = 640,
+ .sizeimage = 640 * 480 * 3 / 8 + 590,
+ .colorspace = V4L2_COLORSPACE_JPEG,
+ .priv = 0},
+};
+
+static const struct v4l2_pix_format pac7311_vga_mode[] = {
{160, 120, V4L2_PIX_FMT_PJPG, V4L2_FIELD_NONE,
.bytesperline = 160,
.sizeimage = 160 * 120 * 3 / 8 + 590,
@@ -642,8 +650,8 @@ static int pac7302_sd_config(struct gspc
cam = &gspca_dev->cam;
PDEBUG(D_CONF, "Find Sensor PAC7302");
- cam->cam_mode = &vga_mode[2]; /* only 640x480 */
- cam->nmodes = 1;
+ cam->cam_mode = pac7302_vga_mode; /* only 640x480 */
+ cam->nmodes = ARRAY_SIZE(pac7302_vga_mode);
sd->brightness = BRIGHTNESS_DEF;
sd->contrast = CONTRAST_DEF;
@@ -666,8 +674,8 @@ static int pac7311_sd_config(struct gspc
cam = &gspca_dev->cam;
PDEBUG(D_CONF, "Find Sensor PAC7311");
- cam->cam_mode = vga_mode;
- cam->nmodes = ARRAY_SIZE(vga_mode);
+ cam->cam_mode = pac7311_vga_mode;
+ cam->nmodes = ARRAY_SIZE(pac7311_vga_mode);
sd->contrast = CONTRAST_DEF;
sd->gain = GAIN_DEF;
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
