aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-controls.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-04-27 02:38:13 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-17 10:57:17 -0400
commit2a9ec3731137f973c6289698de6566a25418b96f (patch)
treeeb223ef2c2860dc1dd7bdd6fa06a7fca2210b133 /drivers/media/pci/ivtv/ivtv-controls.c
parent9ea1b7a4b66fddfab9e65e243b72d18371f8d9a5 (diff)
[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.c4
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 c60424601cb9..2b0ab26e11e8 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)
135 /* V4L2_CID_MPEG_VIDEO_DEC_PTS and V4L2_CID_MPEG_VIDEO_DEC_FRAME 135 /* V4L2_CID_MPEG_VIDEO_DEC_PTS and V4L2_CID_MPEG_VIDEO_DEC_FRAME
136 control cluster */ 136 control cluster */
137 case V4L2_CID_MPEG_VIDEO_DEC_PTS: 137 case V4L2_CID_MPEG_VIDEO_DEC_PTS:
138 return ivtv_g_pts_frame(itv, &itv->ctrl_pts->val64, 138 return ivtv_g_pts_frame(itv, itv->ctrl_pts->p_new.p_s64,
139 &itv->ctrl_frame->val64); 139 itv->ctrl_frame->p_new.p_s64);
140 } 140 }
141 return 0; 141 return 0;
142} 142}