Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58541f7a authored by Sinclair Yeh's avatar Sinclair Yeh
Browse files

drm/vmwgfx: Fix error paths when mapping framebuffer 



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

Signed-off-by: default avatarSinclair Yeh <syeh@vmware.com>
Reviewed-by: default avatarCharmaine Lee <charmainel@vmware.com>
Reported-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Cc: <stable@vger.kernel.org>
parent beca4cf5

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static int vmw_fb_set_par(struct fb_info *info) 
		ret = vfb->pin(vfb);

		if (ret) {

			DRM_ERROR("Could not pin the fbdev framebuffer.\n");

			return ret;

			goto out_unlock;

		}



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

			vfb->unpin(vfb);

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