github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 14:12:07 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media fixes for v6.2-rc7

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+QmuaPwR3wnBdVwACF8+vY7k4RUFAmPYz2gACgkQCF8+vY7k
 4RVhGxAAl6/3HVAYNu4NZr8CXtetUEN6LkecoUbsuVgUTkrdpH3LN4YzKEqO3/gD
 88uNeavYZMTyc6AQo86WFWY4bHY+eXPpJJHve+bsXKeq2AYarHgHDeDT50uVvSAw
 WrlTaWz90ZM1fpmWBh22ylo56DyPktNeOyLUO/AQXAs4LiradztOyw67JKAdNsNQ
 MNrclAcPx+r8lcwCrUiJkXoSSWvoTPsx2Cl4iWm84I63yLsaNv2AfxV1cmYE9j8K
 6ylb69O54sdEpdh1qV1zsfNnn+RGsOCyEEIgZx6CfxiCP+VFSETSW/l8nrVvEDoK
 TGDwmNZUgPx8XQ5gBv5cPnrJMKUQhIBgyPBf0Tg1gz/4FIM6mIIlcbQ19/Y4ufXS
 BLZMotxbvmtVrgn0N2zc7D//hds6Irfe/5XReYe0F77i8/Zc5ctNS7KErJ8xXjvF
 GBH5M/5mFhAJzcirkcn8UNewjb709e/00VrLvjy0NooorEjB2h0ptXYE59syYFJS
 V6h0YhPsZp1xy3MEWoKwQcl+unxuSkF72nFyGMK5ccuzu5ONQVUu7xrTBSMTu490
 NsVqPNZyHPmTK5R39alioS+EZXHaMF3gVRcwo4Mr5Nd4PunKUtvstHQJuZMqfezh
 sDix8wsGC0myhmyHjgu7zrhfg3jyRbJS4OBPqmqAcuA8HgngkME=
 =Q6E+
 -----END PGP SIGNATURE-----

Merge tag 'media/v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "A couple of v4l2 core fixes:

   - fix a regression on strings control support

   - fix a regression for some drivers that depend on an odd streaming
     behavior"

* tag 'media/v6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: videobuf2: set q->streaming later
  media: v4l2-ctrls-api.c: move ctrl->is_new = 1 to the correct line
This commit is contained in:
Linus Torvalds 2023-01-31 11:17:38 -08:00
commit 88b356e191
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/common/videobuf2/videobuf2-core.c
View File

@ -2149,8 +2149,6 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type)
if (ret)
return ret;
q->streaming = 1;
/*
* Tell driver to start streaming provided sufficient buffers
* are available.
@ -2161,12 +2159,13 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type)
goto unprepare;
}
q->streaming = 1;
dprintk(q, 3, "successful\n");
return 0;
unprepare:
call_void_qop(q, unprepare_streaming, q);
q->streaming = 0;
return ret;
}
EXPORT_SYMBOL_GPL(vb2_core_streamon);

2
drivers/media/v4l2-core/v4l2-ctrls-api.c
View File

@ -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: