From f146c1cf472700a62daf18b1a9f6624c065fec44 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Thu, 3 Nov 2011 21:03:04 +0100 Subject: [PATCH] --- yaml --- r: 275015 b: refs/heads/master c: d982640914d74054d22508ccebeeda70ce5933e1 h: refs/heads/master i: 275013: e1a7ff4b6dd7530816899a2f680a6ffbe3d3cab2 275011: 100ed4c09b350d8f7359efe49bc487f9f741f2c7 275007: f76b289fb78d436dbf8f862449049f71c309b555 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c371b9d4dd5b..fd39590b8336 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da7653d6a0dcf7c3a173c87df144735e61a86c1e +refs/heads/master: d982640914d74054d22508ccebeeda70ce5933e1 diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 5ccce1c3daf9..41a905d6c4f1 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -997,7 +997,7 @@ static struct drm_framebuffer *vmw_kms_fb_create(struct drm_device *dev, required_size = mode_cmd->pitch * mode_cmd->height; if (unlikely(required_size > (u64) dev_priv->vram_size)) { DRM_ERROR("VRAM size is too small for requested mode.\n"); - return NULL; + return ERR_PTR(-ENOMEM); } /*