diff options
| author | Hans Verkuil | 2022-12-28 18:02:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2023-02-09 11:28:01 +0100 |
| commit | 7715f96f4ba63b45bb25a88dcf408703aa5caba4 (patch) | |
| tree | c30c30d46f4e4b96bd637031c4340ea8fb9da1b5 | |
| parent | d5c7a2ab5e1f7c8cfaec8255aaed5e541d8f512a (diff) | |
media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line
[ Upstream commit a1550700629f30c5bd554161524f14f14600d554 ]
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 <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls-api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index 3d3b6dc24ca6..002ea6588edf 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: |