Commit a1550700 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: 73278d48 ("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1")
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 2241ab53

drivers/media/v4l2-core/v4l2-ctrls-api.c

+1 −1
Original line number Diff line number Diff line
@@ -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: