Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Destroy mutex if we init...



details:   https://anonhg.NetBSD.org/src/rev/45840dad03e4
branches:  trunk
changeset: 834791:45840dad03e4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 06:16:22 2018 +0000

description:
Destroy mutex if we init it.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_display.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r ec97fadab495 -r 45840dad03e4 sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Mon Aug 27 06:16:01 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c       Mon Aug 27 06:16:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_display.c,v 1.17 2018/08/27 06:16:01 riastradh Exp $     */
+/*     $NetBSD: intel_display.c,v 1.18 2018/08/27 06:16:22 riastradh Exp $     */
 
 /*
  * Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.17 2018/08/27 06:16:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.18 2018/08/27 06:16:22 riastradh Exp $");
 
 #include <linux/dmi.h>
 #include <linux/module.h>
@@ -15705,6 +15705,12 @@
        mutex_unlock(&dev->struct_mutex);
 
        intel_teardown_gmbus(dev);
+
+#ifdef __NetBSD__
+       linux_mutex_destroy(&dev_priv->pps_mutex);
+#else
+       mutex_destroy(&dev_priv->pps_mutex);
+#endif
 }
 
 /*



Home | Main Index | Thread Index | Old Index