media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line

[ Upstream commit 2e1ef6afd40cb5aa3f08081dca83b1ac98a74d10 ]

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: 6e2d718ac395 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c
index 3d3b6dc24ca6374d64a0e9e39482f10a46ad41f0..002ea6588edf163d116ccfff8be7cf18cfe733da 100644 (file)
--- 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: