Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b6d33c7 authored by Michael Grzeschik's avatar Michael Grzeschik Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: mt9m111: cropcap and s_crop check if type is VIDEO_CAPTURE 



Signed-off-by: default avatarPhilipp Wiesner <p.wiesner@phytec.de>
Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5384a12b

drivers/media/video/mt9m111.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -447,6 +447,9 @@ static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
	dev_dbg(&client->dev, "%s left=%d, top=%d, width=%d, height=%d\n",

	dev_dbg(&client->dev, "%s left=%d, top=%d, width=%d, height=%d\n",

		__func__, rect.left, rect.top, rect.width, rect.height);

		__func__, rect.left, rect.top, rect.width, rect.height);





	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	ret = mt9m111_make_rect(client, &rect);

	ret = mt9m111_make_rect(client, &rect);

	if (!ret)

	if (!ret)

		mt9m111->rect = rect;

		mt9m111->rect = rect;
@@ -466,12 +469,14 @@ static int mt9m111_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 




static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)

{

{

	if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)

		return -EINVAL;



	a->bounds.left			= MT9M111_MIN_DARK_COLS;

	a->bounds.left			= MT9M111_MIN_DARK_COLS;

	a->bounds.top			= MT9M111_MIN_DARK_ROWS;

	a->bounds.top			= MT9M111_MIN_DARK_ROWS;

	a->bounds.width			= MT9M111_MAX_WIDTH;

	a->bounds.width			= MT9M111_MAX_WIDTH;

	a->bounds.height		= MT9M111_MAX_HEIGHT;

	a->bounds.height		= MT9M111_MAX_HEIGHT;

	a->defrect			= a->bounds;

	a->defrect			= a->bounds;

	a->type				= V4L2_BUF_TYPE_VIDEO_CAPTURE;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.numerator	= 1;

	a->pixelaspect.denominator	= 1;

	a->pixelaspect.denominator	= 1;