summaryrefslogtreecommitdiff
path: root/linux-core/drm_fops.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-12-18 19:18:21 +1100
committerDave Airlie <airlied@redhat.com>2007-12-18 19:18:21 +1100
commit629231c62675fe09f4eb948861a21980a9b79a5a (patch)
tree097ebcbb9f305fdac4cb3ebc15ef89bb8cea20fd /linux-core/drm_fops.c
parentea915c77e169a50ca7dc557512212eafa93e2205 (diff)
parent6d03411e5faa124bac014ebacec470ffd7cf2ce4 (diff)
Merge branch 'modesetting-airlied' into modesetting-101
Diffstat (limited to 'linux-core/drm_fops.c')
-rw-r--r--linux-core/drm_fops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index cc09fc14..7efcb23f 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -472,8 +472,8 @@ int drm_release(struct inode *inode, struct file *filp)
}
mutex_unlock(&dev->ctxlist_mutex);
- mutex_lock(&dev->struct_mutex);
drm_fb_release(filp);
+ mutex_lock(&dev->struct_mutex);
drm_object_release(filp);
if (file_priv->remove_auth_on_close == 1) {
struct drm_file *temp;