Commit 83072371 authored Sep 04, 2019 by Niklas Söderlund Committed by Greg Kroah-Hartman Jan 17, 2020

media: rcar-vin: Fix incorrect return statement in rvin_try_format()

commit a0862a40364e2f87109317e31c51c9d7bc89e33f upstream.

While refactoring code the return statement became corrupted, fix it by
returning the correct return code.

Reported-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Fixes: 897e3713 ("media: rcar-vin: simplify how formats are set and reset"
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a0a3fb1e

drivers/media/platform/rcar-vin/rcar-v4l2.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -196,6 +196,7 @@ static int rvin_try_format(struct rvin_dev *vin, u32 which,
		ret = v4l2_subdev_call(sd, pad, set_fmt, pad_cfg, &format);
		if (ret < 0 && ret != -ENOIOCTLCMD)
		goto done;
		ret = 0;

		v4l2_fill_pix_format(pix, &format.format);

		@@ -230,7 +231,7 @@ static int rvin_try_format(struct rvin_dev *vin, u32 which,
		done:
		v4l2_subdev_free_pad_config(pad_cfg);

		return 0;
		return ret;
		}

		static int rvin_querycap(struct file file, void priv,