From 51a7b78fbc4046a223ca68c427b3cf18e60b6199 Mon Sep 17 00:00:00 2001 From: Volokh Konstantin Date: Sat, 23 Mar 2013 19:28:28 -0300 Subject: [PATCH] --- yaml --- r: 366824 b: refs/heads/master c: 8dbee53b2a8dcc23e8d52d85d7e0b4fe268c55e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/i2c/tw2804.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 6d8bbc93156e..bc92a09a02a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 136d9f3a41bc528773430f2723cf27963bbd6fbc +refs/heads/master: 8dbee53b2a8dcc23e8d52d85d7e0b4fe268c55e7 diff --git a/trunk/drivers/media/i2c/tw2804.c b/trunk/drivers/media/i2c/tw2804.c index 441b7661d491..c5dc2c3bf2d7 100644 --- a/trunk/drivers/media/i2c/tw2804.c +++ b/trunk/drivers/media/i2c/tw2804.c @@ -53,7 +53,7 @@ static const u8 global_registers[] = { 0x3d, 0x80, 0x3e, 0x82, 0x3f, 0x82, - 0x78, 0x0f, + 0x78, 0x00, 0xff, 0xff, /* Terminator (reg 0xff does not exist) */ }; @@ -337,20 +337,6 @@ static int tw2804_s_video_routing(struct v4l2_subdev *sd, u32 input, u32 output, return 0; } -static int tw2804_s_stream(struct v4l2_subdev *sd, int enable) -{ - struct tw2804 *dec = to_state(sd); - struct i2c_client *client = v4l2_get_subdevdata(sd); - u32 reg = read_reg(client, 0x78, 0); - - if (enable == 1) - write_reg(client, 0x78, reg & ~(1 << dec->channel), 0); - else - write_reg(client, 0x78, reg | (1 << dec->channel), 0); - - return 0; -} - static const struct v4l2_ctrl_ops tw2804_ctrl_ops = { .g_volatile_ctrl = tw2804_g_volatile_ctrl, .s_ctrl = tw2804_s_ctrl, @@ -358,7 +344,6 @@ static const struct v4l2_ctrl_ops tw2804_ctrl_ops = { static const struct v4l2_subdev_video_ops tw2804_video_ops = { .s_routing = tw2804_s_video_routing, - .s_stream = tw2804_s_stream, }; static const struct v4l2_subdev_core_ops tw2804_core_ops = {