diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:49:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 07:49:43 -0800 |
| commit | cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede (patch) | |
| tree | 57a286c05baa4356da2e90178c7d99122de61399 /drivers/char/drm/drm_drv.c | |
| parent | 0271fc2db6260dd46f196191e24281af2fddb879 (diff) | |
| parent | 30e2fb188194908e48d3f27a53ccea6740eb1e98 (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/drm_drv.c')
| -rw-r--r-- | drivers/char/drm/drm_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c index c4fa5a29582..dc6bbe8a18d 100644 --- a/drivers/char/drm/drm_drv.c +++ b/drivers/char/drm/drm_drv.c @@ -151,7 +151,7 @@ int drm_lastclose(drm_device_t * dev) if (dev->irq_enabled) drm_irq_uninstall(dev); - down(&dev->struct_sem); + mutex_lock(&dev->struct_mutex); del_timer(&dev->timer); /* Clear pid list */ @@ -231,7 +231,7 @@ int drm_lastclose(drm_device_t * dev) dev->lock.filp = NULL; wake_up_interruptible(&dev->lock.lock_queue); } - up(&dev->struct_sem); + mutex_unlock(&dev->struct_mutex); DRM_DEBUG("lastclose completed\n"); return 0; |