Thu Aug 30 19:03:14 2018 UTC ()
initialize error variable


(tnn)
diff -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm_agp_hook.c
cvs diff -r1.1 -r1.2 src/sys/external/bsd/drm2/drm/drm_agp_hook.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/drm/drm_agp_hook.c 2018/08/28 03:41:39 1.1
+++ src/sys/external/bsd/drm2/drm/drm_agp_hook.c 2018/08/30 19:03:14 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: drm_agp_hook.c,v 1.1 2018/08/28 03:41:39 riastradh Exp $ */ 1/* $NetBSD: drm_agp_hook.c,v 1.2 2018/08/30 19:03:14 tnn Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2018 The NetBSD Foundation, Inc. 4 * Copyright (c) 2018 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.1 2018/08/28 03:41:39 riastradh Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.2 2018/08/30 19:03:14 tnn Exp $");
34 34
35#include <sys/types.h> 35#include <sys/types.h>
36#include <sys/condvar.h> 36#include <sys/condvar.h>
37#include <sys/errno.h> 37#include <sys/errno.h>
38#include <sys/mutex.h> 38#include <sys/mutex.h>
39#include <sys/once.h> 39#include <sys/once.h>
40 40
41#include <drm/drmP.h> 41#include <drm/drmP.h>
42#include <drm/drm_internal.h> 42#include <drm/drm_internal.h>
43 43
44static struct { 44static struct {
45 kmutex_t lock; 45 kmutex_t lock;
46 kcondvar_t cv; 46 kcondvar_t cv;
@@ -79,27 +79,27 @@ drm_agp_register(const struct drm_agp_ho @@ -79,27 +79,27 @@ drm_agp_register(const struct drm_agp_ho
79 error = EBUSY; 79 error = EBUSY;
80 } else { 80 } else {
81 agp_hooks.refcnt++; 81 agp_hooks.refcnt++;
82 agp_hooks.hooks = hooks; 82 agp_hooks.hooks = hooks;
83 } 83 }
84 mutex_exit(&agp_hooks.lock); 84 mutex_exit(&agp_hooks.lock);
85 85
86 return error; 86 return error;
87} 87}
88 88
89int 89int
90drm_agp_deregister(const struct drm_agp_hooks *hooks) 90drm_agp_deregister(const struct drm_agp_hooks *hooks)
91{ 91{
92 int error; 92 int error = 0;
93 93
94 mutex_enter(&agp_hooks.lock); 94 mutex_enter(&agp_hooks.lock);
95 KASSERT(agp_hooks.hooks == hooks); 95 KASSERT(agp_hooks.hooks == hooks);
96 if (agp_hooks.refcnt > 1) { 96 if (agp_hooks.refcnt > 1) {
97 error = EBUSY; 97 error = EBUSY;
98 } else { 98 } else {
99 agp_hooks.refcnt = 0; 99 agp_hooks.refcnt = 0;
100 agp_hooks.hooks = NULL; 100 agp_hooks.hooks = NULL;
101 } 101 }
102 mutex_exit(&agp_hooks.lock); 102 mutex_exit(&agp_hooks.lock);
103 103
104 return error; 104 return error;
105} 105}