1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 7ef1b673e1be..af68eca44abe 100644
--- 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);