drm/vmwgfx: use kzalloc in vmw_surface_define_ioctl()
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Tue, 15 Dec 2015 11:20:54 +0000 (12:20 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 15 Dec 2015 12:37:26 +0000 (13:37 +0100)
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450178476-26284-7-git-send-email-boris.brezillon@free-electrons.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

index 7d620e82e0008fed9f11147f1943239c010ef4de..a3ae9854405f0bdbf1e115a23466c45831103810 100644 (file)
@@ -815,11 +815,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
            srf->sizes[0].height == 64 &&
            srf->format == SVGA3D_A8R8G8B8) {
 
-               srf->snooper.image = kmalloc(64 * 64 * 4, GFP_KERNEL);
-               /* clear the image */
-               if (srf->snooper.image) {
-                       memset(srf->snooper.image, 0x00, 64 * 64 * 4);
-               } else {
+               srf->snooper.image = kzalloc(64 * 64 * 4, GFP_KERNEL);
+               if (!srf->snooper.image) {
                        DRM_ERROR("Failed to allocate cursor_image\n");
                        ret = -ENOMEM;
                        goto out_no_copy;