From 720983a82cdd10ae27bdad2f9943ff2294e7aff9 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Fri, 16 Sep 2022 12:26:39 +0800 Subject: [PATCH] media: rockchip: vicap fixed error of get_selection when result of --get-compose is success, but width/height equal 0, may cause v4l2-ctl unable to save image Signed-off-by: Zefa Chen Change-Id: Ibe572b53da346aef233a15c70c6050ad2207a21d --- drivers/media/platform/rockchip/cif/capture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index 59592c0d8d15..61cd50d2c259 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -5770,9 +5770,7 @@ static int rkcif_g_selection(struct file *file, void *fh, s->r.width = stream->pixm.width; s->r.height = stream->pixm.height; } - } - - if (s->target == V4L2_SEL_TGT_CROP) { + } else if (s->target == V4L2_SEL_TGT_CROP) { if (stream->crop_mask & (CROP_SRC_USR_MASK | CROP_SRC_SENSOR_MASK)) { s->r = stream->crop[CROP_SRC_ACT]; } else { @@ -5781,6 +5779,8 @@ static int rkcif_g_selection(struct file *file, void *fh, s->r.width = stream->pixm.width; s->r.height = stream->pixm.height; } + } else { + goto err; } return ret;