diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-06 17:06:44 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-06 17:06:44 -0600 |
| commit | 47d1ff6e1a24c0126cd0243b1d6d0a3ffbd7a026 (patch) | |
| tree | b53cd3df68e3a199f6764c619c1a5092d27547e2 /drivers/gpu/drm/drm_stub.c | |
| parent | b79631330a653f568a2ac4eb4a32474c80e3fe77 (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'master' of git://git.kernel.org/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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 096e2a37446d..7c8b15b22bf2 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -168,7 +168,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); - mutex_lock(&dev->struct_mutex); + mutex_unlock(&dev->struct_mutex); } return 0; |