diff --git a/msm/msm_drv.c b/msm/msm_drv.c
index 0ce9c21e8a..f511cb8670 100644
--- a/msm/msm_drv.c
+++ b/msm/msm_drv.c
@@ -1725,7 +1725,7 @@ static struct drm_driver msm_driver = {
 	.irq_uninstall      = msm_irq_uninstall,
 	.enable_vblank      = msm_enable_vblank,
 	.disable_vblank     = msm_disable_vblank,
-	.gem_free_object    = msm_gem_free_object,
+	.gem_free_object_unlocked    = msm_gem_free_object,
 	.gem_vm_ops         = &vm_ops,
 	.dumb_create        = msm_gem_dumb_create,
 	.dumb_map_offset    = msm_gem_dumb_map_offset,
diff --git a/msm/msm_gem.c b/msm/msm_gem.c
index fcdaa8da10..c60547a1a0 100644
--- a/msm/msm_gem.c
+++ b/msm/msm_gem.c
@@ -1003,11 +1003,8 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
 /* don't call directly!  Use drm_gem_object_put() and friends */
 void msm_gem_free_object(struct drm_gem_object *obj)
 {
-	struct drm_device *dev = obj->dev;
 	struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
-	WARN_ON(!mutex_is_locked(&dev->struct_mutex));
-
 	/* object should not be on active list: */
 	WARN_ON(is_active(msm_obj));