diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-27 23:20:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-27 23:20:03 +0000 |
| commit | 89eba5eb77bbf92ffed6686c951cc35f4027e71f (patch) | |
| tree | b56887b1753ca2573002bc7f60e5f3e47c33b116 /drivers/char/drm/r128_drv.c | |
| parent | f7ff3f5a67747c7714c3db772d05965a0c033705 (diff) | |
Merge with Linux 2.4.0-test5-pre5.
Diffstat (limited to 'drivers/char/drm/r128_drv.c')
| -rw-r--r-- | drivers/char/drm/r128_drv.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c index e78d0231f..3e3ace345 100644 --- a/drivers/char/drm/r128_drv.c +++ b/drivers/char/drm/r128_drv.c @@ -35,6 +35,8 @@ #endif #include "drmP.h" #include "r128_drv.h" +#include <linux/sched.h> +#include <linux/smp_lock.h> EXPORT_SYMBOL(r128_init); EXPORT_SYMBOL(r128_cleanup); @@ -474,9 +476,11 @@ int r128_open(struct inode *inode, struct file *filp) int r128_release(struct inode *inode, struct file *filp) { drm_file_t *priv = filp->private_data; - drm_device_t *dev = priv->dev; + drm_device_t *dev; int retcode = 0; + lock_kernel(); + dev = priv->dev; DRM_DEBUG("open_count = %d\n", dev->open_count); if (!(retcode = drm_release(inode, filp))) { MOD_DEC_USE_COUNT; @@ -488,13 +492,15 @@ int r128_release(struct inode *inode, struct file *filp) atomic_read(&dev->ioctl_count), dev->blocked); spin_unlock(&dev->count_lock); + unlock_kernel(); return -EBUSY; } spin_unlock(&dev->count_lock); - return r128_takedown(dev); - } - spin_unlock(&dev->count_lock); + retcode = r128_takedown(dev); + } else + spin_unlock(&dev->count_lock); } + unlock_kernel(); return retcode; } |