mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-25 05:04:09 +08:00
media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line
The patch that fixed string control support somehow got mangled when it was
merged in mainline: the added line ended up in the wrong place.
Fix this.
Fixes: 73278d4833
("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1")
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
parent
39d08ab979
commit
05165248df
@ -150,8 +150,8 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)
|
||||
* then return an error.
|
||||
*/
|
||||
if (strlen(ctrl->p_new.p_char) == ctrl->maximum && last)
|
||||
ctrl->is_new = 1;
|
||||
return -ERANGE;
|
||||
ctrl->is_new = 1;
|
||||
}
|
||||
return ret;
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user