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;