diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-30 12:56:08 -0700 |
| commit | cd4c82176f3f429e722ca3fac2abf231af479780 (patch) | |
| tree | 6c658f8ea8cbfcdbb5d3c8518a5f13ca90b465e3 /linux-core/drm_fops.c | |
| parent | 5d69640a6ad15522fa37c3b232eb34acef955892 (diff) | |
| parent | 3f70518f0bcf36a1e2c82db962324dbdee106f67 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'linux-core/drm_fops.c')
| -rw-r--r-- | linux-core/drm_fops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 3521c092..d400a4d5 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -154,10 +154,13 @@ int drm_open(struct inode *inode, struct file *filp) spin_lock(&dev->count_lock); if (!dev->open_count++) { spin_unlock(&dev->count_lock); - return drm_setup(dev); + retcode = drm_setup(dev); + goto out; } spin_unlock(&dev->count_lock); } + + out: mutex_lock(&dev->struct_mutex); BUG_ON((dev->dev_mapping != NULL) && (dev->dev_mapping != inode->i_mapping)); |