2013-08-26 07:15:40

by Wei Yongjun

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

From: Wei Yongjun <[email protected]>

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 <[email protected]>
---
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);

2013-08-26 08:04:30

by Dmitry Torokhov

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

On Monday, August 26, 2013 03:15:37 PM Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 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 <[email protected]>

Acked-by: Dmitry Torokhov <[email protected]>

> ---
> 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);