From ef9edd4347db3e5693fecd9855d3df50fdb9edf3 Mon Sep 17 00:00:00 2001 From: Sanghwa Park Date: Wed, 11 Sep 2019 00:24:03 +0900 Subject: [PATCH] [RAMEN9610-19845][9610] vipx: fix prevent defects 275134: Uninitialized scalar variable 275231: Uninitialized scalar variable 275245: Uninitialized pointer read 275283: Uninitialized scalar variable 275562: Uninitialized scalar variable 275638: Uninitialized scalar variable Change-Id: I12838a018382220052c9c8e99a3e79c8caa4699c Signed-off-by: Sanghwa Park Signed-off-by: Kim Gunho --- .../vipx/platform/exynos9610/vipx-ctrl-exynos9610.c | 2 +- drivers/vision/vipx/vipx-memory.c | 12 +++++++++--- drivers/vision/vipx/vipx-queue.c | 2 ++ drivers/vision/vipx_vertex/vertex-queue.c | 2 ++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/vision/vipx/platform/exynos9610/vipx-ctrl-exynos9610.c b/drivers/vision/vipx/platform/exynos9610/vipx-ctrl-exynos9610.c index 371c43a6c4d2..72733fda6edb 100644 --- a/drivers/vision/vipx/platform/exynos9610/vipx-ctrl-exynos9610.c +++ b/drivers/vision/vipx/platform/exynos9610/vipx-ctrl-exynos9610.c @@ -183,7 +183,7 @@ static int vipx_exynos9610_ctrl_clear_irq(struct vipx_system *sys, offset = regs_ss1[REG_SS1_IRQ_FROM_DEVICE].offset; writel(val, sys->reg_ss[REG_SS1] + offset); } else { - val = -EINVAL; + ret = -EINVAL; vipx_err("direction of irq is invalid (%d)\n", direction); goto p_err; } diff --git a/drivers/vision/vipx/vipx-memory.c b/drivers/vision/vipx/vipx-memory.c index dd1b89ab396b..dbab8131b1c5 100644 --- a/drivers/vision/vipx/vipx-memory.c +++ b/drivers/vision/vipx/vipx-memory.c @@ -278,9 +278,15 @@ static int __vipx_memory_alloc(struct vipx_memory *mem, } pmem->dvaddr = dvaddr; } - vipx_info("[%20s] memory is allocated(%#p,%#x,%zuKB)", - pmem->name, kvaddr, (int)pmem->dvaddr, - pmem->size / SZ_1K); + + if (pmem->kmap) + vipx_info("[%20s] memory is allocated(%#p,%#x,%zuKB)", + pmem->name, kvaddr, (int)pmem->dvaddr, + pmem->size / SZ_1K); + else + vipx_info("[%20s] memory is allocated(%#x,%zuKB)", + pmem->name, (int)pmem->dvaddr, + pmem->size / SZ_1K); vipx_leave(); return 0; diff --git a/drivers/vision/vipx/vipx-queue.c b/drivers/vision/vipx/vipx-queue.c index cdd15cdc5dab..7f6509cc112c 100644 --- a/drivers/vision/vipx/vipx-queue.c +++ b/drivers/vision/vipx/vipx-queue.c @@ -334,6 +334,7 @@ static int __vipx_queue_bundle_prepare(struct vipx_queue *queue, } break; default: + ret = -EINVAL; vipx_err("container memory type is invalid (%u)\n", con[c_cnt].memory); goto p_err; @@ -381,6 +382,7 @@ static int __vipx_queue_bundle_unprepare(struct vipx_queue *queue, __vipx_queue_unmap_dmabuf(queue, &buf[b_cnt]); break; default: + ret = -EINVAL; vipx_err("container memory type is invalid (%u)\n", con[c_cnt].memory); goto p_err; diff --git a/drivers/vision/vipx_vertex/vertex-queue.c b/drivers/vision/vipx_vertex/vertex-queue.c index 16dbe881de28..6813164b9175 100644 --- a/drivers/vision/vipx_vertex/vertex-queue.c +++ b/drivers/vision/vipx_vertex/vertex-queue.c @@ -335,6 +335,7 @@ static int __vertex_queue_bundle_prepare(struct vertex_queue *queue, } break; default: + ret = -EINVAL; vertex_err("container memory type is invalid (%u)\n", con[c_cnt].memory); goto p_err; @@ -382,6 +383,7 @@ static int __vertex_queue_bundle_unprepare(struct vertex_queue *queue, __vertex_queue_unmap_dmabuf(queue, &buf[b_cnt]); break; default: + ret = -EINVAL; vertex_err("container memory type is invalid (%u)\n", con[c_cnt].memory); goto p_err; -- 2.20.1