Attachment 11334 Details for Bug 11870 – Revised patch with style(9) fixes.

[patch] Revised patch with style(9) fixes.

drm_drv.diff (text/plain), 1.29 KB, created by Jung-uk Kim on 2007-08-30 10:54:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2007-08-30 10:54:16 UTC

Size: 1.29 KB

patch

obsolete

>diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
>index afd9035..e721c71 100644
>--- a/bsd-core/drm_drv.c
>+++ b/bsd-core/drm_drv.c
>@@ -535,6 +535,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();
>@@ -717,6 +718,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);
> 
>@@ -792,17 +796,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);

Actions: View | Splinter Review

Attachments on bug 11870: 11013 | 11176 | 11334 | 11358 | 11602 | 11603

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.