git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
drivers
/
video
/
broadsheetfb.c
diff --git
a/drivers/video/broadsheetfb.c
b/drivers/video/broadsheetfb.c
index
ebda687
..
377dde3
100644
(file)
--- a/
drivers/video/broadsheetfb.c
+++ b/
drivers/video/broadsheetfb.c
@@
-1101,12
+1101,10
@@
static int __devinit broadsheetfb_probe(struct platform_device *dev)
videomemorysize = roundup((dpyw*dpyh), PAGE_SIZE);
videomemorysize = roundup((dpyw*dpyh), PAGE_SIZE);
- videomemory = v
m
alloc(videomemorysize);
+ videomemory = v
z
alloc(videomemorysize);
if (!videomemory)
goto err_fb_rel;
if (!videomemory)
goto err_fb_rel;
- memset(videomemory, 0, videomemorysize);
-
info->screen_base = (char *)videomemory;
info->fbops = &broadsheetfb_ops;
info->screen_base = (char *)videomemory;
info->fbops = &broadsheetfb_ops;