From: Andy Lutomirski Date: Thu, 26 May 2011 14:13:34 +0000 (-0400) Subject: efifb: Disallow manual bind and unbind X-Git-Tag: v3.0-rc3~53^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb8b26627267a82c49f47fc52a0785f079a7b063;p=platform%2Fkernel%2Flinux-exynos.git efifb: Disallow manual bind and unbind Both were buggy: bind would happily scribble over a real graphics device and unbind wouldn't destroy the framebuffer. Hotplugging efifb makes no sense anyway, so just disable it. As an added benefit, we save some runtime memory. Signed-off-by: Andy Lutomirski Signed-off-by: Peter Jones Signed-off-by: Paul Mundt --- diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c index 8cb31e1..69c49df 100644 --- a/drivers/video/efifb.c +++ b/drivers/video/efifb.c @@ -330,7 +330,7 @@ static int __init efifb_setup(char *options) return 0; } -static int __devinit efifb_probe(struct platform_device *dev) +static int __init efifb_probe(struct platform_device *dev) { struct fb_info *info; int err; @@ -500,7 +500,6 @@ err_release_mem: } static struct platform_driver efifb_driver = { - .probe = efifb_probe, .driver = { .name = "efifb", }, @@ -531,13 +530,21 @@ static int __init efifb_init(void) if (!screen_info.lfb_linelength) return -ENODEV; - ret = platform_driver_register(&efifb_driver); + ret = platform_device_register(&efifb_device); + if (ret) + return ret; - if (!ret) { - ret = platform_device_register(&efifb_device); - if (ret) - platform_driver_unregister(&efifb_driver); + /* + * This is not just an optimization. We will interfere + * with a real driver if we get reprobed, so don't allow + * it. + */ + ret = platform_driver_probe(&efifb_driver, efifb_probe); + if (ret) { + platform_device_unregister(&efifb_driver); + return ret; } + return ret; } module_init(efifb_init);