From d909102601fd78f4f49c08ab1f9deb28a50d02bd Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 15 Nov 2012 13:04:37 +0000 Subject: [PATCH] --- yaml --- r: 345301 b: refs/heads/master c: 08bec5b4edd13a7cb0bc2fb27c529d794ae67054 h: refs/heads/master i: 345299: c7e9e072b52e7d99b129c70991783146d07095df v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index b1dffe4f9813..405f013c560c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fabd4eedeb904173d05cb1ced3c3e6b9d2e8137 +refs/heads/master: 08bec5b4edd13a7cb0bc2fb27c529d794ae67054 diff --git a/trunk/drivers/gpu/drm/drm_stub.c b/trunk/drivers/gpu/drm/drm_stub.c index c236fd27eba6..581e61d04057 100644 --- a/trunk/drivers/gpu/drm/drm_stub.c +++ b/trunk/drivers/gpu/drm/drm_stub.c @@ -221,20 +221,20 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, if (!file_priv->master) return -EINVAL; - if (!file_priv->minor->master && - file_priv->minor->master != file_priv->master) { - mutex_lock(&dev->struct_mutex); - file_priv->minor->master = drm_master_get(file_priv->master); - file_priv->is_master = 1; - if (dev->driver->master_set) { - ret = dev->driver->master_set(dev, file_priv, false); - if (unlikely(ret != 0)) { - file_priv->is_master = 0; - drm_master_put(&file_priv->minor->master); - } + if (file_priv->minor->master) + return -EINVAL; + + mutex_lock(&dev->struct_mutex); + file_priv->minor->master = drm_master_get(file_priv->master); + file_priv->is_master = 1; + if (dev->driver->master_set) { + ret = dev->driver->master_set(dev, file_priv, false); + if (unlikely(ret != 0)) { + file_priv->is_master = 0; + drm_master_put(&file_priv->minor->master); } - mutex_unlock(&dev->struct_mutex); } + mutex_unlock(&dev->struct_mutex); return 0; }