Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / gpu / drm / drm_fops.c

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 828bf65..020b103 100644 (file)
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -136,8 +136,11 @@ int drm_open(struct inode *inode, struct file *filp)
        retcode = drm_open_helper(inode, filp, dev);
        if (!retcode) {
                atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
-               if (!dev->open_count++)
+               if (!dev->open_count++) {
                        retcode = drm_setup(dev);
+                       if (retcode)
+                               dev->open_count--;
+               }
        }
        if (!retcode) {
                mutex_lock(&dev->struct_mutex);