From: Rob Clark <robdclark@gmail.com>
Date: Tue, 4 Feb 2014 19:17:32 +0000 (-0500)
Subject: drm/msm: fix deadlock in bo create fail path
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9999f105e76977d97304d7cb2030a52d96800d69;p=linux-beck.git

drm/msm: fix deadlock in bo create fail path

We already hold struct_mutex here.

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index d8d60c969ac7..3da8264d3039 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -644,7 +644,7 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev,
 
 fail:
 	if (obj)
-		drm_gem_object_unreference_unlocked(obj);
+		drm_gem_object_unreference(obj);
 
 	return ERR_PTR(ret);
 }