projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] v4l2-ctrls: use ptrs for all but the s32 type
[cascardo/linux.git]
/
drivers
/
staging
/
media
/
solo6x10
/
solo6x10-v4l2-enc.c
diff --git
a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
index
b8ff113
..
37f7fd0
100644
(file)
--- 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:
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:
err = solo_osd_print(solo_enc);
return err;
default:
@@
-1326,7
+1326,6
@@
static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
solo_enc->vfd->ctrl_handler = hdl;
solo_enc->vfd->queue = &solo_enc->vidq;
solo_enc->vfd->lock = &solo_enc->lock;
solo_enc->vfd->ctrl_handler = hdl;
solo_enc->vfd->queue = &solo_enc->vidq;
solo_enc->vfd->lock = &solo_enc->lock;
- set_bit(V4L2_FL_USE_FH_PRIO, &solo_enc->vfd->flags);
video_set_drvdata(solo_enc->vfd, solo_enc);
ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr);
if (ret < 0)
video_set_drvdata(solo_enc->vfd, solo_enc);
ret = video_register_device(solo_enc->vfd, VFL_TYPE_GRABBER, nr);
if (ret < 0)