From: Jon Arne Jørgensen Date: Sat, 3 Aug 2013 12:19:36 +0000 (-0300) Subject: upstream: [media] saa7115: Do not load saa7115_init_misc for gm7113c X-Git-Tag: submit/tizen/20141121.110247~1974 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e14c7a4b650bd86fcea8c3f2f81b52801c8f2ba6;p=platform%2Fkernel%2Flinux-3.10.git upstream: [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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c index 41408dd..17a464d 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);