Merge tag 'lsk-v3.10-android-14.12'

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / rga2 / rga2_drv.c

diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c
index 5f908f422c857d68933265212dbac7ead51dd266..ce517f1ff40a422e293cfca897e6b84467c76764 100755 (executable)
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -456,7 +456,7 @@ static void rga2_copy_reg(struct rga2_reg *reg, uint32_t offset)
 \r
 static struct rga2_reg * rga2_reg_init(rga2_session *session, struct rga2_req *req)\r
 {\r
-    uint32_t ret;\r
+    int32_t ret;\r
        struct rga2_reg *reg = kzalloc(sizeof(struct rga2_reg), GFP_KERNEL);\r
        if (NULL == reg) {\r
                pr_err("kmalloc fail in rga_reg_init\n");\r
@@ -1111,7 +1111,7 @@ static struct miscdevice rga2_dev ={
 };\r
 \r
 static const struct of_device_id rockchip_rga_dt_ids[] = {\r
-       { .compatible = "rockchip,rga2_drv", },\r
+       { .compatible = "rockchip,rk3288-rga2", },\r
        {},\r
 };\r
 \r