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
/
gpu
/
drm
/
vmwgfx
/
vmwgfx_overlay.c
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
index
df2036e
..
f1a52f9
100644
(file)
--- a/
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
+++ b/
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
@@
-585,7
+585,7
@@
int vmw_overlay_init(struct vmw_private *dev_priv)
return -ENOSYS;
}
- overlay = kmalloc(
GFP_KERNEL, sizeof(*overlay)
);
+ overlay = kmalloc(
sizeof(*overlay), GFP_KERNEL
);
if (!overlay)
return -ENOMEM;