[PATCH] drm/vmwgfx: fix error return code in vmw_driver_load()

Dmitry Torokhov dtor at vmware.com
Mon Aug 26 00:56:00 PDT 2013


On Monday, August 26, 2013 03:15:37 PM Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> 
> 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 at trendmicro.com.cn>

Acked-by: Dmitry Torokhov <dtor at vmware.com>

> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 78e2164..6dafefc 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);


More information about the dri-devel mailing list