diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 19:59:09 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 19:59:09 +0000 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /drivers/gpu/drm/drm_stub.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
| download | kernel-crypto-cbb7fe129bb2b836083ebcc256c43faff4b48cc2.tar.gz kernel-crypto-cbb7fe129bb2b836083ebcc256c43faff4b48cc2.tar.xz kernel-crypto-cbb7fe129bb2b836083ebcc256c43faff4b48cc2.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/gpu/drm/drm_stub.c')
| -rw-r--r-- | drivers/gpu/drm/drm_stub.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index d009661781b..ef878615c49 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -159,6 +159,9 @@ void drm_master_put(struct drm_master **master) int drm_setmaster_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { + if (file_priv->is_master) + return 0; + if (file_priv->minor->master && file_priv->minor->master != file_priv->master) return -EINVAL; @@ -169,6 +172,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, 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; mutex_unlock(&dev->struct_mutex); } @@ -178,10 +182,15 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data, int drm_dropmaster_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { - if (!file_priv->master) + if (!file_priv->is_master) return -EINVAL; + + if (!file_priv->minor->master) + return -EINVAL; + mutex_lock(&dev->struct_mutex); drm_master_put(&file_priv->minor->master); + file_priv->is_master = 0; mutex_unlock(&dev->struct_mutex); return 0; } |