diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-04-27 06:38:13 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 14:57:17 (GMT) |
commit | 2a9ec3731137f973c6289698de6566a25418b96f (patch) | |
tree | eb223ef2c2860dc1dd7bdd6fa06a7fca2210b133 /drivers/staging/media/solo6x10 | |
parent | 9ea1b7a4b66fddfab9e65e243b72d18371f8d9a5 (diff) | |
download | linux-2a9ec3731137f973c6289698de6566a25418b96f.tar.xz |
[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/staging/media/solo6x10')
-rw-r--r-- | drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c index bb2604e..37f7fd0 100644 --- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c @@ -1131,7 +1131,7 @@ static int solo_s_ctrl(struct v4l2_ctrl *ctrl) solo_motion_toggle(solo_enc, ctrl->val); return 0; case V4L2_CID_OSD_TEXT: - strcpy(solo_enc->osd_text, ctrl->string); + strcpy(solo_enc->osd_text, ctrl->p_new.p_char); err = solo_osd_print(solo_enc); return err; default: |