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 Fix s/dev->primary->master/de...



details:   https://anonhg.NetBSD.org/src/rev/d067d5316c3a
branches:  trunk
changeset: 1027823:d067d5316c3a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:49:43 2021 +0000

description:
Fix s/dev->primary->master/dev->master/ missed in merge.

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_bufs.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r da3597cbe5e8 -r d067d5316c3a sys/external/bsd/drm2/dist/drm/drm_bufs.c
--- a/sys/external/bsd/drm2/dist/drm/drm_bufs.c Sun Dec 19 00:49:36 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_bufs.c Sun Dec 19 00:49:43 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_bufs.c,v 1.13 2021/12/18 23:44:57 riastradh Exp $  */
+/*     $NetBSD: drm_bufs.c,v 1.14 2021/12/19 00:49:43 riastradh Exp $  */
 
 /*
  * Legacy: Generic DRM Buffer Management
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.13 2021/12/18 23:44:57 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_bufs.c,v 1.14 2021/12/19 00:49:43 riastradh Exp $");
 
 #include <linux/export.h>
 #include <linux/log2.h>
@@ -266,7 +266,7 @@
                        if (dev->master->lock.hw_lock != NULL) {
                                vfree(map->handle);
                                kfree(map);
-                               spin_unlock(&dev->primary->master->lock.spinlock);
+                               spin_unlock(&dev->master->lock.spinlock);
                                return -EBUSY;
                        }
                        spin_unlock(&dev->primary->master->lock.spinlock);



Home | Main Index | Thread Index | Old Index