Merge tag 'v4.4-rc3'

[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 041847d68c15a245cbd22a6c85ce8386019d2371..a3de7916655f9b26ab91d86b0cfe1968bf5c1b88 100644 (file)
--- a/drivers/video/rockchip/rga2/rga2_drv.c
+++ b/drivers/video/rockchip/rga2/rga2_drv.c
@@ -828,8 +828,6 @@ static long rga_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
        int ret = 0;\r
     rga2_session *session;\r
 \r
-    return ret;\r
-\r
     memset(&req, 0x0, sizeof(req));\r
 \r
     mutex_lock(&rga2_service.mutex);\r