Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

[mirror_ubuntu-zesty-kernel.git] / drivers / video / msm / mddi_client_nt35399.c

diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c
index d7a5bf84fb2ac07a08eda5957fd179981ed4dca0..f96df32e5509a4581209cb867827c2ba35c68305 100644 (file)
--- a/drivers/video/msm/mddi_client_nt35399.c
+++ b/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;
 }