aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.csengg@gmail.com>2013-05-25 12:39:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-13 10:41:18 -0400
commitd97ada97ae7b29a83bc04fc3a05ef7b75c88e335 (patch)
tree4ffe4af533d2e73eddbfe1f2e549be83ab66aed3
parent68f9f8ae98a580fa710f9652b01b9690e224fb1f (diff)
[media] media: i2c: ths7303: remove init_enable option from pdata
This patch removes init_enable option from pdata, the init_enable was intended that the device should start streaming video immediately but ideally the bridge drivers should call s_stream explicitly for such devices to start video. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/i2c/ths7303.c4
-rw-r--r--include/media/ths7303.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/i2c/ths7303.c b/drivers/media/i2c/ths7303.c
index 65853eea09a1..8cddcd0cfa09 100644
--- a/drivers/media/i2c/ths7303.c
+++ b/drivers/media/i2c/ths7303.c
@@ -356,9 +356,7 @@ static int ths7303_setup(struct v4l2_subdev *sd)
356 int ret; 356 int ret;
357 u8 mask; 357 u8 mask;
358 358
359 state->stream_on = pdata->init_enable; 359 mask = 0xf8;
360
361 mask = state->stream_on ? 0xff : 0xf8;
362 360
363 ret = ths7303_write(sd, THS7303_CHANNEL_1, pdata->ch_1 & mask); 361 ret = ths7303_write(sd, THS7303_CHANNEL_1, pdata->ch_1 & mask);
364 if (ret) 362 if (ret)
diff --git a/include/media/ths7303.h b/include/media/ths7303.h
index 980ec51d574d..a7b49297da82 100644
--- a/include/media/ths7303.h
+++ b/include/media/ths7303.h
@@ -30,13 +30,11 @@
30 * @ch_1: Bias value for channel one. 30 * @ch_1: Bias value for channel one.
31 * @ch_2: Bias value for channel two. 31 * @ch_2: Bias value for channel two.
32 * @ch_3: Bias value for channel three. 32 * @ch_3: Bias value for channel three.
33 * @init_enable: initalize on init.
34 */ 33 */
35struct ths7303_platform_data { 34struct ths7303_platform_data {
36 u8 ch_1; 35 u8 ch_1;
37 u8 ch_2; 36 u8 ch_2;
38 u8 ch_3; 37 u8 ch_3;
39 u8 init_enable;
40}; 38};
41 39
42#endif 40#endif