Commit 0f1cb1bd authored Oct 29, 2012 by Ilija Hadzic Committed by Dave Airlie Nov 07, 2012

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 <ihadzic@research.bell-labs.com>
Cc: stable@vger.kernel.org
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 3d70f8c6

drivers/gpu/drm/drm_fops.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);