malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/vmwgfx: Fix error paths when mapping framebuffer

Browse Source 
Rather than returning immediately, make sure to unlock the
mutexes first.

Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reported-by: Emil Velikov <emil.l.velikov@gmail.com>
Cc: <stable@vger.kernel.org>
This commit is contained in:
Sinclair Yeh 2016-07-07 11:01:30 -07:00
parent beca4cf553
commit 58541f7a64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
View File

@ -589,7 +589,7 @@ static int vmw_fb_set_par(struct fb_info *info)
ret = vfb->pin(vfb); ret = vfb->pin(vfb);
if (ret) { if (ret) {
DRM_ERROR("Could not pin the fbdev framebuffer.\n"); DRM_ERROR("Could not pin the fbdev framebuffer.\n");
return ret; goto out_unlock;
} }
ret = ttm_bo_kmap(&par->vmw_bo->base, 0, ret = ttm_bo_kmap(&par->vmw_bo->base, 0,
@ -597,7 +597,7 @@ static int vmw_fb_set_par(struct fb_info *info)
if (ret) { if (ret) {
vfb->unpin(vfb); vfb->unpin(vfb);
DRM_ERROR("Could not map the fbdev framebuffer.\n"); DRM_ERROR("Could not map the fbdev framebuffer.\n");
return ret; goto out_unlock;
} }
par->bo_ptr = ttm_kmap_obj_virtual(&par->map, &par->bo_iowrite); par->bo_ptr = ttm_kmap_obj_virtual(&par->map, &par->bo_iowrite);