CVS commit: src/sys/dev/pci

[Ryo Shimizu]

Module Name:    src
Committed By:   ryo
Date:           Sat Dec  3 08:20:12 UTC 2011

Modified Files:
        src/sys/dev/pci: esa.c

Log Message:
the argument of esa_get_locks() is struct esa_voice *, not struct esa_softc *.

ok by mrg@ jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/esa.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/dev/pci/esa.c
diff -u src/sys/dev/pci/esa.c:1.56 src/sys/dev/pci/esa.c:1.57
--- src/sys/dev/pci/esa.c:1.56	Thu Nov 24 03:35:59 2011
+++ src/sys/dev/pci/esa.c	Sat Dec  3 08:20:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.56 2011/11/24 03:35:59 mrg Exp $ */
+/* $NetBSD: esa.c,v 1.57 2011/12/03 08:20:12 ryo Exp $ */
 
 /*
  * Copyright (c) 2001-2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.56 2011/11/24 03:35:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.57 2011/12/03 08:20:12 ryo Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -1809,9 +1809,12 @@ esa_mappage(void *addr, void *mem, off_t
 static void
 esa_get_locks(void *addr, kmutex_t **intr, kmutex_t **proc)
 {
+	struct esa_voice *vc;
 	struct esa_softc *sc;
 
-	sc = addr;
+	vc = addr;
+	sc = device_private(vc->parent);
+
 	*intr = &sc->sc_intr_lock;
 	*proc = &sc->sc_lock;
 }