Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 253136
b: refs/heads/master
c: 1b86d77
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Paul Mundt committed Jun 2, 2011
1 parent ef71465 commit 0c65710
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb8b26627267a82c49f47fc52a0785f079a7b063
refs/heads/master: 1b86d775dd4c13967e1895df09d0cef198956e81
5 changes: 2 additions & 3 deletions trunk/drivers/video/arcfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,10 @@ static int __devinit arcfb_probe(struct platform_device *dev)

/* We need a flat backing store for the Arc's
less-flat actual paged framebuffer */
if (!(videomemory = vmalloc(videomemorysize)))
videomemory = vzalloc(videomemorysize);
if (!videomemory)
return retval;

memset(videomemory, 0, videomemorysize);

info = framebuffer_alloc(sizeof(struct arcfb_par), &dev->dev);
if (!info)
goto err;
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/video/broadsheetfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1101,12 +1101,10 @@ static int __devinit broadsheetfb_probe(struct platform_device *dev)

videomemorysize = roundup((dpyw*dpyh), PAGE_SIZE);

videomemory = vmalloc(videomemorysize);
videomemory = vzalloc(videomemorysize);
if (!videomemory)
goto err_fb_rel;

memset(videomemory, 0, videomemorysize);

info->screen_base = (char *)videomemory;
info->fbops = &broadsheetfb_ops;

Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/video/hecubafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,10 @@ static int __devinit hecubafb_probe(struct platform_device *dev)

videomemorysize = (DPY_W*DPY_H)/8;

if (!(videomemory = vmalloc(videomemorysize)))
videomemory = vzalloc(videomemorysize);
if (!videomemory)
return retval;

memset(videomemory, 0, videomemorysize);

info = framebuffer_alloc(sizeof(struct hecubafb_par), &dev->dev);
if (!info)
goto err_fballoc;
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/video/metronomefb.c
Original file line number Diff line number Diff line change
Expand Up @@ -628,12 +628,10 @@ static int __devinit metronomefb_probe(struct platform_device *dev)
/* we need to add a spare page because our csum caching scheme walks
* to the end of the page */
videomemorysize = PAGE_SIZE + (fw * fh);
videomemory = vmalloc(videomemorysize);
videomemory = vzalloc(videomemorysize);
if (!videomemory)
goto err_fb_rel;

memset(videomemory, 0, videomemorysize);

info->screen_base = (char __force __iomem *)videomemory;
info->fbops = &metronomefb_ops;

Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/video/xen-fbfront.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,10 +395,9 @@ static int __devinit xenfb_probe(struct xenbus_device *dev,
spin_lock_init(&info->dirty_lock);
spin_lock_init(&info->resize_lock);

info->fb = vmalloc(fb_size);
info->fb = vzalloc(fb_size);
if (info->fb == NULL)
goto error_nomem;
memset(info->fb, 0, fb_size);

info->nr_pages = (fb_size + PAGE_SIZE - 1) >> PAGE_SHIFT;

Expand Down

0 comments on commit 0c65710

Please sign in to comment.