Commit 88b356e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 22b8077d 89c08aef

drivers/media/common/videobuf2/videobuf2-core.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

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: