video: rockchip: mipi: free cmds buf in rockchip_lcd_mipi_remove
authorXubilv <xbl@rock-chips.com>
Fri, 6 May 2016 07:19:19 +0000 (15:19 +0800)
committerGerrit Code Review <gerrit@rock-chips.com>
Thu, 19 May 2016 11:47:54 +0000 (19:47 +0800)
Change-Id: If805e7b6797841a92252a879526200da166141fd
Signed-off-by: Xubilv <xbl@rock-chips.com>
drivers/video/rockchip/screen/lcd_mipi.c

index 48b75b9bb7f50404643e6d6ee1ef82f30f78f29b..10bb2677ea5ec23636d2c339314b42fef11cd249 100755 (executable)
@@ -146,8 +146,6 @@ static void rk_mipi_screen_cmd_init(struct mipi_screen *screen)
                        msleep(dcs_cmd->dcs_cmd.delay);
                } else
                        MIPI_SCREEN_DBG("cmd type err.\n");
-               kfree(dcs_cmd->dcs_cmd.cmds);
-               dcs_cmd->dcs_cmd.cmds = NULL;
        }
 
 #ifdef CONFIG_RK_3288_DSI_UBOOT
@@ -280,7 +278,8 @@ int rk_mipi_screen_standby(u8 enable)
        return 0;
 }
 #ifdef CONFIG_LCD_MIPI
-static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
+static int rk_mipi_screen_init_dt(struct device *dev,
+                                 struct mipi_screen *screen)
 {
        struct device_node *childnode, *grandchildnode, *root;
        struct mipi_dcs_cmd_ctr_list *dcs_cmd;
@@ -423,7 +422,7 @@ static int rk_mipi_screen_init_dt(struct mipi_screen *screen)
                        strcpy(dcs_cmd->dcs_cmd.name, childnode->name);
 
                        dcs_cmd->dcs_cmd.cmds =
-                               kzalloc(CMD_LEN_MAX, GFP_KERNEL);
+                               devm_kzalloc(dev, CMD_LEN_MAX, GFP_KERNEL);
                        if (!dcs_cmd->dcs_cmd.cmds) {
                                pr_err("malloc cmds fail!\n");
                                return -ENOMEM;
@@ -747,7 +746,7 @@ static int __init rk_mipi_screen_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       ret = rk_mipi_screen_init_dt(gmipi_screen);
+       ret = rk_mipi_screen_init_dt(&pdev->dev, gmipi_screen);
        if (ret < 0) {
                dev_err(&pdev->dev, " rk_mipi_screen_init_dt fail!\n");
                return -1;