Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / gspca / stv06xx / stv06xx_hdcs.h

diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h
index cf3d0ccc1121f008b46616f7e3c5a6a9dec569f3..b538dce96f78d8cbb1c7297ea8b40ce21712ea7b 100644 (file)
--- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h
+++ b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h
@@ -146,6 +146,11 @@ const struct stv06xx_sensor stv06xx_sensor_hdcs1x00 = {
        .i2c_addr = (0x55 << 1),
        .i2c_len = 1,
 
+       /* FIXME (see if we can lower min_packet_size, needs testing, and also
+          adjusting framerate when the bandwidth gets lower) */
+       .min_packet_size = { 847 },
+       .max_packet_size = { 847 },
+
        .init = hdcs_init,
        .probe = hdcs_probe_1x00,
        .start = hdcs_start,
@@ -160,6 +165,11 @@ const struct stv06xx_sensor stv06xx_sensor_hdcs1020 = {
        .i2c_addr = (0x55 << 1),
        .i2c_len = 1,
 
+       /* FIXME (see if we can lower min_packet_size, needs testing, and also
+          adjusting framerate when the bandwidthm gets lower) */
+       .min_packet_size = { 847 },
+       .max_packet_size = { 847 },
+
        .init = hdcs_init,
        .probe = hdcs_probe_1020,
        .start = hdcs_start,
@@ -177,7 +187,6 @@ static const u16 stv_bridge_init[][2] = {
        {STV_REG04, 0x07},
 
        {STV_SCAN_RATE, 0x20},
-       {STV_ISO_SIZE_L, 847},
        {STV_Y_CTRL, 0x01},
        {STV_X_CTRL, 0x0a}
 };