From 14de6b8c8f5467481068df9a80e829c344762483 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Wed, 3 May 2023 18:54:25 +0900 Subject: [PATCH] amlogic: ionvideo: Fix to check memory address instead of array There is wrong address null check with array. Instead, fix to check passed physical memory address properly. Change-Id: I2cf422795585b68d9cd216737e78d478097e7e36 Signed-off-by: Seung-Woo Kim --- drivers/amlogic/media/video_processor/ionvideo/ppmgr2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/amlogic/media/video_processor/ionvideo/ppmgr2.c b/drivers/amlogic/media/video_processor/ionvideo/ppmgr2.c index 6c06640..ad64ed2 100644 --- a/drivers/amlogic/media/video_processor/ionvideo/ppmgr2.c +++ b/drivers/amlogic/media/video_processor/ionvideo/ppmgr2.c @@ -389,11 +389,6 @@ int ppmgr2_canvas_config(struct ppmgr2_device *ppd, int index) int canvas_height = ppd->dst_buffer_height; void *phy_addr; - if (!ppd->phy_addr) { - ppmgr2_printk(1, "NULL physical address!\n"); - return -1; - } - phy_addr = ppd->phy_addr[index]; if (index >= PPMGR2_MAX_CANVAS) { @@ -402,6 +397,11 @@ int ppmgr2_canvas_config(struct ppmgr2_device *ppd, int index) return -1; } + if (!phy_addr) { + ppmgr2_printk(1, "NULL physical address!\n"); + return -1; + } + if (ppd->ge2d_fmt == GE2D_FORMAT_M24_NV21 || ppd->ge2d_fmt == GE2D_FORMAT_M24_NV12) { canvas_config(PPMGR2_CANVAS_INDEX, (ulong)phy_addr, -- 2.7.4