From: Shen Zhenyi <szy@rock-chips.com>
Date: Fri, 26 Feb 2016 09:16:42 +0000 (+0800)
Subject: video: rockchip: tve: fix compile error and warning
X-Git-Tag: firefly_0821_release~3347
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a5a28cb9c79c28bed8939f975566e0df97687b60;p=firefly-linux-kernel-4.4.55.git

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 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 {