From: Hans Verkuil Date: Wed, 28 Dec 2022 17:02:27 +0000 (+0100) Subject: media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line X-Git-Tag: v6.6.7~3644^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1550700629f30c5bd554161524f14f14600d554;p=platform%2Fkernel%2Flinux-starfive.git 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: 73278d483378 ("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1") Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index 3d3b6dc..002ea65 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -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: