diff options
author | Dave Airlie <airlied@redhat.com> | 2014-01-21 18:11:09 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-01-21 18:11:09 -0500 |
commit | aec476a6764687fd1a76a272f95537a0aed37a0c (patch) | |
tree | 5ce9c33b66764d444862ba591b03060d27764737 /drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | |
parent | 8c9b2e322d5c9b4e77fd308984ea303de4b63e1c (diff) | |
parent | 3e894a6259964618e29809b844bffaaf9849067b (diff) |
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next
Just a single fix for sparse/smatch warnings introduced by the previous
vmwgfx-next pull.
* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Fix recently introduced sparse / smatch warnings and errors
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_surface.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 3bb3331acdaf..979da1c246a5 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | |||
@@ -1117,6 +1117,7 @@ static int vmw_gb_surface_destroy(struct vmw_resource *res) | |||
1117 | if (unlikely(cmd == NULL)) { | 1117 | if (unlikely(cmd == NULL)) { |
1118 | DRM_ERROR("Failed reserving FIFO space for surface " | 1118 | DRM_ERROR("Failed reserving FIFO space for surface " |
1119 | "destruction.\n"); | 1119 | "destruction.\n"); |
1120 | mutex_unlock(&dev_priv->binding_mutex); | ||
1120 | return -ENOMEM; | 1121 | return -ENOMEM; |
1121 | } | 1122 | } |
1122 | 1123 | ||