Module Name: src
Committed By: riastradh
Date: Mon Aug 27 15:24:40 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/linux: linux_dma_buf.c
Log Message:
Simplify. Destroy the mutex too.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/linux/linux_dma_buf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/linux/linux_dma_buf.c
diff -u src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.2 src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.3
--- src/sys/external/bsd/drm2/linux/linux_dma_buf.c:1.2 Mon Aug 27 15:24:11 2018
+++ src/sys/external/bsd/drm2/linux/linux_dma_buf.c Mon Aug 27 15:24:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_dma_buf.c,v 1.2 2018/08/27 15:24:11 riastradh Exp $ */
+/* $NetBSD: linux_dma_buf.c,v 1.3 2018/08/27 15:24:40 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.2 2018/08/27 15:24:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_dma_buf.c,v 1.3 2018/08/27 15:24:40 riastradh Exp $");
#include <sys/types.h>
#include <sys/atomic.h>
@@ -167,9 +167,9 @@ dma_buf_put(struct dma_buf *dmabuf)
if (atomic_dec_uint_nv(&dmabuf->db_refcnt) != 0)
return;
- if (dmabuf->resv == &dmabuf->db_resv_int[0])
- reservation_object_fini(dmabuf->resv);
+ mutex_destroy(&dmabuf->db_lock);
if (dmabuf->resv == &dmabuf->db_resv_int[0]) {
+ reservation_object_fini(dmabuf->resv);
kmem_free(dmabuf, offsetof(struct dma_buf, db_resv_int[1]));
} else {
kmem_free(dmabuf, sizeof(*dmabuf));
