Merge tag 'mac80211-for-john-2014-11-18' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / video / fbdev / msm / msm_fb.c

diff --git a/drivers/video/fbdev/msm/msm_fb.c b/drivers/video/fbdev/msm/msm_fb.c
index 1374803..2979d7e 100644 (file)
--- a/drivers/video/fbdev/msm/msm_fb.c
+++ b/drivers/video/fbdev/msm/msm_fb.c
@@ -569,8 +569,13 @@ static int msmfb_probe(struct platform_device *pdev)
        mutex_init(&msmfb->panel_init_lock);
        init_waitqueue_head(&msmfb->frame_wq);
        INIT_WORK(&msmfb->resume_work, power_on_panel);
-       msmfb->black = kzalloc(msmfb->fb->var.bits_per_pixel*msmfb->xres,
-                              GFP_KERNEL);
+       msmfb->black = devm_kzalloc(&pdev->dev,
+                                   msmfb->fb->var.bits_per_pixel*msmfb->xres,
+                                   GFP_KERNEL);
+       if (!msmfb->black) {
+               ret = -ENOMEM;
+               goto error_register_framebuffer;
+       }
 
        printk(KERN_INFO "msmfb_probe() installing %d x %d panel\n",
               msmfb->xres, msmfb->yres);
@@ -589,6 +594,8 @@ static int msmfb_probe(struct platform_device *pdev)
 
        msmfb->sleeping = WAKING;
 
+       platform_set_drvdata(pdev, msmfb);
+
        return 0;
 
 error_register_framebuffer:
@@ -598,9 +605,23 @@ error_setup_fbmem:
        return ret;
 }
 
+static int msmfb_remove(struct platform_device *pdev)
+{
+       struct msmfb_info *msmfb;
+
+       msmfb = platform_get_drvdata(pdev);
+
+       unregister_framebuffer(msmfb->fb);
+       iounmap(msmfb->fb->screen_base);
+       framebuffer_release(msmfb->fb);
+
+       return 0;
+}
+
 static struct platform_driver msm_panel_driver = {
        /* need to write remove */
        .probe = msmfb_probe,
+       .remove = msmfb_remove,
        .driver = {.name = "msm_panel"},
 };