video: rockchip: tve: fix compile error and warning

Change-Id: Iacfc54e3f1c01cf3827cbb576d36f64145976bc1
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>

diff --git a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c
index 19a5b3b4da629ae8d115629bdd27123d917992dd..ee30ae6d20b2a72dd666e40de57b9238ee09057d 100755 (executable)
--- 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 6b902bf16773ade851118015a7a29a6de748cb4e..8194a0543fc8c78fe3b0a01211e71bdeb3d8a0f6 100644 (file)
--- 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 {