aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-01-23 09:14:56 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-03-07 08:30:49 -0500
commit60231da1275fbd46a0977219a95d42c53a5c91ff (patch)
tree7db73541850bcb0bdbccec28552867937866e4e2
parent65b4021ed67622b675b431fc2f3633b2af8cea6d (diff)
fbdev: vesafb: add dev->remove() callback
If x86-sysfb platform-devices are removed from a system, we should properly unload vesafb. Otherwise, we end up releasing the parent while our vesa framebuffer is still running. This currently works just fine, but will cause problems on handover to real hw. So add the ->remove() callback and unregister vesafb. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/vesafb.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 1c7da3b098d6..6170e7f58640 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -179,7 +179,6 @@ static void vesafb_destroy(struct fb_info *info)
179 if (info->screen_base) 179 if (info->screen_base)
180 iounmap(info->screen_base); 180 iounmap(info->screen_base);
181 release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size); 181 release_mem_region(info->apertures->ranges[0].base, info->apertures->ranges[0].size);
182 framebuffer_release(info);
183} 182}
184 183
185static struct fb_ops vesafb_ops = { 184static struct fb_ops vesafb_ops = {
@@ -297,6 +296,7 @@ static int vesafb_probe(struct platform_device *dev)
297 release_mem_region(vesafb_fix.smem_start, size_total); 296 release_mem_region(vesafb_fix.smem_start, size_total);
298 return -ENOMEM; 297 return -ENOMEM;
299 } 298 }
299 platform_set_drvdata(dev, info);
300 info->pseudo_palette = info->par; 300 info->pseudo_palette = info->par;
301 info->par = NULL; 301 info->par = NULL;
302 302
@@ -499,12 +499,23 @@ err:
499 return err; 499 return err;
500} 500}
501 501
502static int vesafb_remove(struct platform_device *pdev)
503{
504 struct fb_info *info = platform_get_drvdata(pdev);
505
506 unregister_framebuffer(info);
507 framebuffer_release(info);
508
509 return 0;
510}
511
502static struct platform_driver vesafb_driver = { 512static struct platform_driver vesafb_driver = {
503 .driver = { 513 .driver = {
504 .name = "vesa-framebuffer", 514 .name = "vesa-framebuffer",
505 .owner = THIS_MODULE, 515 .owner = THIS_MODULE,
506 }, 516 },
507 .probe = vesafb_probe, 517 .probe = vesafb_probe,
518 .remove = vesafb_remove,
508}; 519};
509 520
510module_platform_driver(vesafb_driver); 521module_platform_driver(vesafb_driver);