]> Pileus Git - ~andy/linux/commitdiff
[media] saa7115: Do not load saa7115_init_misc for gm7113c
authorJon Arne Jørgensen <jonarne@jonarne.no>
Sat, 3 Aug 2013 12:19:36 +0000 (09:19 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Sun, 18 Aug 2013 11:25:44 +0000 (08:25 -0300)
Most of the registers changed in saa7115_init_misc table are out of range
for the gm7113c chip.
The only register that's within range, don't need to be changed here.

Signed-off-by: Jon Arne Jørgensen <jonarne@jonarne.no>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/i2c/saa7115.c

index 41408ddda79bb5878283dc5f7648c2eafa26bc86..17a464d4e5266150d1d8d2ee7ffd0959d52f0aa6 100644 (file)
@@ -1769,7 +1769,7 @@ static int saa711x_probe(struct i2c_client *client,
                state->crystal_freq = SAA7115_FREQ_32_11_MHZ;
                saa711x_writeregs(sd, saa7115_init_auto_input);
        }
-       if (state->ident > SAA7111A)
+       if (state->ident > SAA7111A && state->ident != GM7113C)
                saa711x_writeregs(sd, saa7115_init_misc);
        saa711x_set_v4lstd(sd, V4L2_STD_NTSC);
        v4l2_ctrl_handler_setup(hdl);