diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-03-02 13:02:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-08 11:03:51 -0300 |
| commit | eb2ba855470797b20dced364f5897cc949e7ade6 (patch) | |
| tree | 84d5543750c89c3167ac0712c7e999d2a28e9892 /drivers/media/video/ivtv/ivtv-controls.c | |
| parent | 072e660257ee26e4f4defd836b1e1fa23d68de32 (diff) | |
[media] ivtv: simplify how the decoder controls are set up
The code was unnecessarily complex, introducing a hdl_out handler that was
not needed. Instead just add the controls to the cxhdl.hdl handler directly.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-controls.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-controls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c index e2901184db0..c60424601cb 100644 --- a/drivers/media/video/ivtv/ivtv-controls.c +++ b/drivers/media/video/ivtv/ivtv-controls.c @@ -129,7 +129,7 @@ int ivtv_g_pts_frame(struct ivtv *itv, s64 *pts, s64 *frame) static int ivtv_g_volatile_ctrl(struct v4l2_ctrl *ctrl) { - struct ivtv *itv = container_of(ctrl->handler, struct ivtv, hdl_out); + struct ivtv *itv = container_of(ctrl->handler, struct ivtv, cxhdl.hdl); switch (ctrl->id) { /* V4L2_CID_MPEG_VIDEO_DEC_PTS and V4L2_CID_MPEG_VIDEO_DEC_FRAME @@ -143,7 +143,7 @@ static int ivtv_g_volatile_ctrl(struct v4l2_ctrl *ctrl) static int ivtv_s_ctrl(struct v4l2_ctrl *ctrl) { - struct ivtv *itv = container_of(ctrl->handler, struct ivtv, hdl_out); + struct ivtv *itv = container_of(ctrl->handler, struct ivtv, cxhdl.hdl); switch (ctrl->id) { /* V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK and MULTILINGUAL_PLAYBACK |