aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/metronomefb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/metronomefb.c')
-rw-r--r--drivers/video/metronomefb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
index 9b3d6e4584cc..97d45e5115e2 100644
--- a/drivers/video/metronomefb.c
+++ b/drivers/video/metronomefb.c
@@ -10,7 +10,7 @@
10 * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. 10 * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
11 * 11 *
12 * This work was made possible by help and equipment support from E-Ink 12 * This work was made possible by help and equipment support from E-Ink
13 * Corporation. http://support.eink.com/community 13 * Corporation. http://www.eink.com/
14 * 14 *
15 * This driver is written to be used with the Metronome display controller. 15 * This driver is written to be used with the Metronome display controller.
16 * It is intended to be architecture independent. A board specific driver 16 * It is intended to be architecture independent. A board specific driver
@@ -628,12 +628,10 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
628 /* we need to add a spare page because our csum caching scheme walks 628 /* we need to add a spare page because our csum caching scheme walks
629 * to the end of the page */ 629 * to the end of the page */
630 videomemorysize = PAGE_SIZE + (fw * fh); 630 videomemorysize = PAGE_SIZE + (fw * fh);
631 videomemory = vmalloc(videomemorysize); 631 videomemory = vzalloc(videomemorysize);
632 if (!videomemory) 632 if (!videomemory)
633 goto err_fb_rel; 633 goto err_fb_rel;
634 634
635 memset(videomemory, 0, videomemorysize);
636
637 info->screen_base = (char __force __iomem *)videomemory; 635 info->screen_base = (char __force __iomem *)videomemory;
638 info->fbops = &metronomefb_ops; 636 info->fbops = &metronomefb_ops;
639 637
@@ -765,7 +763,7 @@ static int __devexit metronomefb_remove(struct platform_device *dev)
765 763
766static struct platform_driver metronomefb_driver = { 764static struct platform_driver metronomefb_driver = {
767 .probe = metronomefb_probe, 765 .probe = metronomefb_probe,
768 .remove = metronomefb_remove, 766 .remove = __devexit_p(metronomefb_remove),
769 .driver = { 767 .driver = {
770 .owner = THIS_MODULE, 768 .owner = THIS_MODULE,
771 .name = "metronomefb", 769 .name = "metronomefb",