Merge branch 'master' into modesetting-101 - TTM & typedef removal

[android-x86/external-libdrm.git] / linux-core / drm_fops.c

diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index ab5f4ca..643205c 100644 (file)
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -265,6 +265,7 @@ static int drm_open_helper(struct inode *inode, struct file *filp,
        INIT_LIST_HEAD(&priv->lhead);
        INIT_LIST_HEAD(&priv->user_objects);
        INIT_LIST_HEAD(&priv->refd_objects);
+       INIT_LIST_HEAD(&priv->fbs);
 
        for (i=0; i<_DRM_NO_REF_TYPES; ++i) {
                ret = drm_ht_create(&priv->refd_object_hash[i], DRM_FILE_HASH_ORDER);
@@ -486,6 +487,7 @@ int drm_release(struct inode *inode, struct file *filp)
        mutex_unlock(&dev->ctxlist_mutex);
 
        mutex_lock(&dev->struct_mutex);
+       drm_fb_release(filp);
        drm_object_release(filp);
        if (file_priv->remove_auth_on_close == 1) {
                struct drm_file *temp;