diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-11-29 07:49:19 +0100 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-07-18 08:40:55 +0200 |
| commit | d7f482313322892b28f3c14958177cd15c6a113d (patch) | |
| tree | fdd1a16f10442a207f1ce55db59647602de8e0c1 /drivers/gpu/drm/vmwgfx | |
| parent | drm/vmwgfx: Fix NULL pointer comparison (diff) | |
| download | linux-d7f482313322892b28f3c14958177cd15c6a113d.tar.xz linux-d7f482313322892b28f3c14958177cd15c6a113d.zip | |
drm/vmwgfx: Fix handling of errors returned by 'vmw_cotable_alloc()'
'vmw_cotable_alloc()' returns an error pointer on error, not NULL.
Propagate the error code, instead of returning -ENOMEM unconditionally
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c index 1a46b18bf2b7..be0877651098 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c @@ -209,8 +209,8 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv, for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) { uctx->cotables[i] = vmw_cotable_alloc(dev_priv, &uctx->res, i); - if (unlikely(uctx->cotables[i] == NULL)) { - ret = -ENOMEM; + if (unlikely(IS_ERR(uctx->cotables[i]))) { + ret = PTR_ERR(uctx->cotables[i]); goto out_cotables; } } |