summaryrefslogtreecommitdiff
path: root/bsd-core
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-10-25 09:24:45 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-10-25 09:24:45 +0200
commit07706c9b79b88baff5f160351b482ccdf3315f0c (patch)
tree0679ad42a802894aae3d535efdaf229d985b54bc /bsd-core
parent3d4b32e91647f61712d54a46f0a173deff46e6b4 (diff)
parenta70fe82baf0ca2be98e02680cff489f90b0ea3de (diff)
Merge branch 'master' into drm-ttm-finalize
Diffstat (limited to 'bsd-core')
-rw-r--r--bsd-core/drm_drv.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index c36b78aa..d6868b9c 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -538,6 +538,7 @@ static int drm_load(drm_device_t *dev)
if (dev->driver.load != NULL) {
DRM_LOCK();
+ /* Shared code returns -errno. */
retcode = -dev->driver.load(dev,
dev->id_entry->driver_private);
DRM_UNLOCK();
@@ -720,6 +721,9 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
return EINVAL;
}
+ if (--file_priv->refs != 0)
+ goto done;
+
if (dev->driver.preclose != NULL)
dev->driver.preclose(dev, file_priv);
@@ -795,17 +799,16 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
dev->buf_pgid = 0;
#endif /* __NetBSD__ || __OpenBSD__ */
- if (--file_priv->refs == 0) {
- if (dev->driver.postclose != NULL)
- dev->driver.postclose(dev, file_priv);
- TAILQ_REMOVE(&dev->files, file_priv, link);
- free(file_priv, M_DRM);
- }
+ if (dev->driver.postclose != NULL)
+ dev->driver.postclose(dev, file_priv);
+ TAILQ_REMOVE(&dev->files, file_priv, link);
+ free(file_priv, M_DRM);
/* ========================================================
* End inline drm_release
*/
+done:
atomic_inc( &dev->counts[_DRM_STAT_CLOSES] );
#ifdef __FreeBSD__
device_unbusy(dev->device);