diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-08-26 08:46:29 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-21 10:51:49 -0300 |
| commit | 6f43dbfd8fa7f80b1cf073446275c691b52cd7b2 (patch) | |
| tree | 1dcd858c390a63647879de4cf2e65a7e5d34186a /drivers/media/video/saa7115.c | |
| parent | 34ebdc97b9f273262559ab410d18f4e9424a54c2 (diff) | |
| download | blackbird-op-linux-6f43dbfd8fa7f80b1cf073446275c691b52cd7b2.tar.gz blackbird-op-linux-6f43dbfd8fa7f80b1cf073446275c691b52cd7b2.zip | |
[media] saa7115: use the new auto cluster support
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7115.c')
| -rw-r--r-- | drivers/media/video/saa7115.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index e443d0d54f8f..cee98ea0eca7 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c @@ -793,7 +793,6 @@ static int saa711x_s_ctrl(struct v4l2_ctrl *ctrl) saa711x_write(sd, R_0F_CHROMA_GAIN_CNTL, state->gain->val); else saa711x_write(sd, R_0F_CHROMA_GAIN_CNTL, state->gain->val | 0x80); - v4l2_ctrl_activate(state->gain, !state->agc->val); break; default: @@ -1601,7 +1600,6 @@ static int saa711x_probe(struct i2c_client *client, V4L2_CID_CHROMA_AGC, 0, 1, 1, 1); state->gain = v4l2_ctrl_new_std(hdl, &saa711x_ctrl_ops, V4L2_CID_CHROMA_GAIN, 0, 127, 1, 40); - state->gain->flags |= V4L2_CTRL_FLAG_VOLATILE; sd->ctrl_handler = hdl; if (hdl->error) { int err = hdl->error; @@ -1610,8 +1608,7 @@ static int saa711x_probe(struct i2c_client *client, kfree(state); return err; } - state->agc->flags |= V4L2_CTRL_FLAG_UPDATE; - v4l2_ctrl_cluster(2, &state->agc); + v4l2_ctrl_auto_cluster(2, &state->agc, 0, true); state->input = -1; state->output = SAA7115_IPORT_ON; |
