diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-04-27 03:38:13 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 11:57:17 -0300 |
| commit | 2a9ec3731137f973c6289698de6566a25418b96f (patch) | |
| tree | eb223ef2c2860dc1dd7bdd6fa06a7fca2210b133 /drivers/media/pci/ivtv/ivtv-controls.c | |
| parent | 9ea1b7a4b66fddfab9e65e243b72d18371f8d9a5 (diff) | |
| download | op-kernel-dev-2a9ec3731137f973c6289698de6566a25418b96f.zip op-kernel-dev-2a9ec3731137f973c6289698de6566a25418b96f.tar.gz | |
[media] v4l2-ctrls: use ptrs for all but the s32 type
Rather than having two unions for all types just keep 'val' and
'cur.val' and use the p_cur and p_new unions to access all others.
The only reason for keeping 'val' and 'cur.val' is that it is used
all over, so converting this as well would be a huge job.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-controls.c')
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-controls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-controls.c b/drivers/media/pci/ivtv/ivtv-controls.c index c604246..2b0ab26 100644 --- a/drivers/media/pci/ivtv/ivtv-controls.c +++ b/drivers/media/pci/ivtv/ivtv-controls.c @@ -135,8 +135,8 @@ static int ivtv_g_volatile_ctrl(struct v4l2_ctrl *ctrl) /* V4L2_CID_MPEG_VIDEO_DEC_PTS and V4L2_CID_MPEG_VIDEO_DEC_FRAME control cluster */ case V4L2_CID_MPEG_VIDEO_DEC_PTS: - return ivtv_g_pts_frame(itv, &itv->ctrl_pts->val64, - &itv->ctrl_frame->val64); + return ivtv_g_pts_frame(itv, itv->ctrl_pts->p_new.p_s64, + itv->ctrl_frame->p_new.p_s64); } return 0; } |
