aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorHans de Goede <j.w.r.degoede@hhs.nl>2008-07-23 07:04:39 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-26 12:54:16 -0300
commitfff4205f1d64163132609942314e94ec3ba2ed6b (patch)
tree3b1ac0696ac57c91d366d2657bdc81d21e60a720 /drivers/media
parent84754319e30a25626f6bf0d84efc7935ba1d0b3d (diff)
V4L/DVB (8458): gspca_sonixb remove one more no longer needed special case from the code
gspca_sonixb remove one more no longer needed special case from the code Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/sonixb.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index fd91f43e078..93d36545659 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -868,7 +868,6 @@ static void sd_start(struct gspca_dev *gspca_dev)
struct sd *sd = (struct sd *) gspca_dev;
int mode, l = 0x1f;
const __u8 *sn9c10x;
- __u8 reg01, reg17;
__u8 reg17_19[3];
mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
@@ -922,21 +921,10 @@ static void sd_start(struct gspca_dev *gspca_dev)
break;
}
- /* Special case for SN9C101/2 with OV 7630 */
- /* HDG: is this really necessary we overwrite the values immediately
- afterwards with the ones from the template ?? */
- if (sd->sensor == SENSOR_OV7630 && sd->fr_h_sz == 12) {
- reg01 = 0x06;
- reg17 = 0x29;
- } else {
- reg01 = sn9c10x[0];
- reg17 = sn9c10x[0x17 - 1];
- }
-
/* reg 0x01 bit 2 video transfert on */
- reg_w(gspca_dev, 0x01, &reg01, 1);
+ reg_w(gspca_dev, 0x01, &sn9c10x[0x01 - 1], 1);
/* reg 0x17 SensorClk enable inv Clk 0x60 */
- reg_w(gspca_dev, 0x17, &reg17, 1);
+ reg_w(gspca_dev, 0x17, &sn9c10x[0x17 - 1], 1);
/* Set the registers from the template */
reg_w_big(gspca_dev, 0x01, sn9c10x, l);
switch (sd->sensor) {