From a5a28cb9c79c28bed8939f975566e0df97687b60 Mon Sep 17 00:00:00 2001 From: Shen Zhenyi Date: Fri, 26 Feb 2016 17:16:42 +0800 Subject: [PATCH] video: rockchip: tve: fix compile error and warning Change-Id: Iacfc54e3f1c01cf3827cbb576d36f64145976bc1 Signed-off-by: Shen Zhenyi --- drivers/video/rockchip/tve/rk3036/rk3036_tve.c | 1 - drivers/video/rockchip/tve/rk3036/rk3036_tve.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c index 19a5b3b4da62..ee30ae6d20b2 100755 --- a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c +++ b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c @@ -437,7 +437,6 @@ static int rk3036_tve_probe(struct platform_device *pdev) rk3036_tve->inputformat = INPUT_FORMAT_YUV; } else { dev_err(&pdev->dev, "It is not a valid tv encoder!"); - kfree(rk3036_tve); return -ENOMEM; } diff --git a/drivers/video/rockchip/tve/rk3036/rk3036_tve.h b/drivers/video/rockchip/tve/rk3036/rk3036_tve.h index 6b902bf16773..8194a0543fc8 100644 --- a/drivers/video/rockchip/tve/rk3036/rk3036_tve.h +++ b/drivers/video/rockchip/tve/rk3036/rk3036_tve.h @@ -125,7 +125,7 @@ enum { #define grf_writel(offset, v) do { \ writel_relaxed(v, RK_GRF_VIRT + offset); \ - dsb(); \ + dsb(sy); \ } while (0) struct rk3036_tve { -- 2.34.1