drm: restore open_count if drm_setup fails

If drm_setup (called at first open) fails, the whole
open call has failed, so we should not keep the
open_count incremented.

Signed-off-by: Ilija Hadzic <[email protected]>
Cc: [email protected]
Reviewed-by: Thomas Hellstrom <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 7ef1b673e1be9ec2f82006ca3d8ea2519e13b231..af68eca44abed7d46638a106d5f6b6cad79fe6e9 100644 (file)
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -135,8 +135,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);