From: Philipp Zabel
Date: Fri, 23 Jun 2017 11:57:27 +0000 (-0400)
Subject: media: coda: do not reassign ctx->tiled_map_type in coda_s_fmt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c2a4559435e2915209fd9588253111ee1dc2f7a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git
media: coda: do not reassign ctx->tiled_map_type in coda_s_fmt
This smatch warning:
coda/coda-common.c:706 coda_s_fmt() warn: missing break? reassigning 'ctx->tiled_map_type'
can be silenced by moving the ctx->tiled_map_type assignment into the
breakout condition. That way the field is not reassigned when falling
through to the next switch statement.
Signed-off-by: Philipp Zabel
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
---
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index d119b4777328..90c061e50409 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -714,9 +714,10 @@ static int coda_s_fmt(struct coda_ctx *ctx, struct v4l2_format *f,
ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP;
break;
case V4L2_PIX_FMT_NV12:
- ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP;
- if (!disable_tiling)
+ if (!disable_tiling) {
+ ctx->tiled_map_type = GDI_TILED_FRAME_MB_RASTER_MAP;
break;
+ }
/* else fall through */
case V4L2_PIX_FMT_YUV420:
case V4L2_PIX_FMT_YVU420: