diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-08-26 07:15:37 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-08-29 22:57:51 (GMT) |
| commit | 14bbf20c8839eb595753712e15b8786f9cdc5ed8 (patch) | |
| tree | 08545e74aa131c7e6522aacbe1e78eb13a352cd7 /drivers/gpu/drm/vmwgfx | |
| parent | 1793126fcebd7c18834f95d43b55e387a8803aa8 (diff) | |
| download | linux-fsl-qoriq-14bbf20c8839eb595753712e15b8786f9cdc5ed8.tar.xz | |
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/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 |
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 0dcfa6b..1a90f0a 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) } dev_priv->fman = vmw_fence_manager_init(dev_priv); - if (unlikely(dev_priv->fman == NULL)) + if (unlikely(dev_priv->fman == NULL)) { + ret = -ENOMEM; goto out_no_fman; + } vmw_kms_save_vga(dev_priv); |