diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-21 09:44:41 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-21 09:44:41 -0800 |
commit | 5461e079009ae2732c833281c4b50dfb58d15ba5 (patch) | |
tree | 72f4c17ef32adba164a2819ee6eaf6495597e5b5 /drivers/media/v4l2-core | |
parent | 7a693ea78e3c48605a2d849fd241ff15561f10d5 (diff) | |
parent | 542d3c03fd895eb8370992293498332ea383a3b9 (diff) | |
download | linux-stable-5461e079009ae2732c833281c4b50dfb58d15ba5.tar.gz linux-stable-5461e079009ae2732c833281c4b50dfb58d15ba5.tar.bz2 linux-stable-5461e079009ae2732c833281c4b50dfb58d15ba5.zip |
Merge tag 'media/v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- A regression at V4L2 core breaking string controls
- Build warning fixes on sun6i drivers when building with clang
* tag 'media/v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: sun6i-isp: params: Unregister pending buffer on cleanup
media: sun6i-isp: params: Fix incorrect indentation
media: sun6i-isp: capture: Fix uninitialized variable use
media: sun6i-isp: proc: Declare subdev ops as static
media: sun6i-isp: proc: Error out on invalid port to fix warning
media: sun6i-isp: proc: Fix return code handling in stream off path
media: sun8i-a83t-mipi-csi2: Clarify return code handling in stream off path
media: sun6i-mipi-csi2: Clarify return code handling in stream off path
media: sun6i-csi: capture: Remove useless ret initialization
media: sun6i-csi: bridge: Error out on invalid port to fix warning
media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1
Diffstat (limited to 'drivers/media/v4l2-core')
-rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls-api.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c index d0a3aa3806fb..3d3b6dc24ca6 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -150,6 +150,7 @@ 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; } return ret; |