From 0f3c5b5009224cfc1b3c0a3f2ece39f1e1f1c2d0 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 3 Aug 2012 17:40:13 +0200 Subject: [PATCH] --- yaml --- r: 333429 b: refs/heads/master c: a654ddac0892eb8495d75cbd7f45646895cc5e5f h: refs/heads/master i: 333427: fffca9e18bb2ba301a68e4981d0ca730a4d9f963 v: v3 --- [refs] | 2 +- trunk/drivers/video/msm/mddi_client_nt35399.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 24401d91c9dc..e2d82973fc6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7e69add39481dafb509a07ab527784d415b567b +refs/heads/master: a654ddac0892eb8495d75cbd7f45646895cc5e5f diff --git a/trunk/drivers/video/msm/mddi_client_nt35399.c b/trunk/drivers/video/msm/mddi_client_nt35399.c index 7fcd67e132bf..66b314e68dee 100644 --- a/trunk/drivers/video/msm/mddi_client_nt35399.c +++ b/trunk/drivers/video/msm/mddi_client_nt35399.c @@ -189,8 +189,9 @@ static int mddi_nt35399_probe(struct platform_device *pdev) int ret; - struct panel_info *panel = kzalloc(sizeof(struct panel_info), - GFP_KERNEL); + struct panel_info *panel = devm_kzalloc(&pdev->dev, + sizeof(struct panel_info), + GFP_KERNEL); printk(KERN_DEBUG "%s: enter.\n", __func__); @@ -233,7 +234,6 @@ static int mddi_nt35399_remove(struct platform_device *pdev) struct panel_info *panel = platform_get_drvdata(pdev); setup_vsync(panel, 0); - kfree(panel); return 0; }