aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-08-26 03:15:37 -0400
committerDave Airlie <airlied@gmail.com>2013-08-29 18:57:51 -0400
commit14bbf20c8839eb595753712e15b8786f9cdc5ed8 (patch)
tree08545e74aa131c7e6522aacbe1e78eb13a352cd7 /drivers/gpu/drm
parent1793126fcebd7c18834f95d43b55e387a8803aa8 (diff)
drm/vmwgfx: fix error return code in vmw_driver_load()
Fix to return -ENOMEM in the fence manager init error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Dmitry Torokhov <dtor@vmware.com> Signed-off-by: Dave Airlie <airlied@gmail.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 0dcfa6b76c45..1a90f0a2f7e5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -622,8 +622,10 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
622 } 622 }
623 623
624 dev_priv->fman = vmw_fence_manager_init(dev_priv); 624 dev_priv->fman = vmw_fence_manager_init(dev_priv);
625 if (unlikely(dev_priv->fman == NULL)) 625 if (unlikely(dev_priv->fman == NULL)) {
626 ret = -ENOMEM;
626 goto out_no_fman; 627 goto out_no_fman;
628 }
627 629
628 vmw_kms_save_vga(dev_priv); 630 vmw_kms_save_vga(dev_priv);
629 631