From 16715da01791c3d6fe88db71ec301c9267b63aa1 Mon Sep 17 00:00:00 2001 From: zsq Date: Wed, 20 Aug 2014 10:40:17 +0800 Subject: [PATCH] rga/rga2 driver error handling fixed --- drivers/video/rockchip/rga/rga_drv.c | 4 ++-- drivers/video/rockchip/rga2/rga2_drv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/rockchip/rga/rga_drv.c b/drivers/video/rockchip/rga/rga_drv.c index 2a506f805ec0..acad02776311 100755 --- a/drivers/video/rockchip/rga/rga_drv.c +++ b/drivers/video/rockchip/rga/rga_drv.c @@ -458,7 +458,7 @@ static void rga_copy_reg(struct rga_reg *reg, uint32_t offset) static struct rga_reg * rga_reg_init(rga_session *session, struct rga_req *req) { - uint32_t ret; + int32_t ret; struct rga_reg *reg = kzalloc(sizeof(struct rga_reg), GFP_KERNEL); if (NULL == reg) { pr_err("kmalloc fail in rga_reg_init\n"); @@ -505,7 +505,7 @@ static struct rga_reg * rga_reg_init(rga_session *session, struct rga_req *req) static struct rga_reg * rga_reg_init_2(rga_session *session, struct rga_req *req0, struct rga_req *req1) { - uint32_t ret; + int32_t ret; struct rga_reg *reg0, *reg1; diff --git a/drivers/video/rockchip/rga2/rga2_drv.c b/drivers/video/rockchip/rga2/rga2_drv.c index 4db550e7fcb9..ce517f1ff40a 100755 --- 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) static struct rga2_reg * rga2_reg_init(rga2_session *session, struct rga2_req *req) { - uint32_t ret; + int32_t ret; struct rga2_reg *reg = kzalloc(sizeof(struct rga2_reg), GFP_KERNEL); if (NULL == reg) { pr_err("kmalloc fail in rga_reg_init\n"); -- 2.34.1