summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/saa7115.c
diff options
context:
space:
mode:
authorJon Arne Jørgensen <jonarne@jonarne.no>2013-08-03 09:19:36 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-18 08:25:44 -0300
commitb9798bc160968107c82e119f2a59de25f6e70291 (patch)
tree566eccf469f86d2969a782085c18b84131e29a65 /drivers/media/i2c/saa7115.c
parent8b77dfdd8c5838939251cf135ea8363dff108e28 (diff)
downloadblackbird-obmc-linux-b9798bc160968107c82e119f2a59de25f6e70291.tar.gz
blackbird-obmc-linux-b9798bc160968107c82e119f2a59de25f6e70291.zip
[media] saa7115: Do not load saa7115_init_misc for gm7113c
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>
Diffstat (limited to 'drivers/media/i2c/saa7115.c')
-rw-r--r--drivers/media/i2c/saa7115.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index 41408ddda79b..17a464d4e526 100644
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -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);
OpenPOWER on IntegriCloud