[src/trunk]: src/sys/dev/pci the argument of esa_get_locks() is struct esa_vo...

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa305d26ee8c
branches:  trunk
changeset: 771757:fa305d26ee8c
user:      ryo <ryo%NetBSD.org@localhost>
date:      Sat Dec 03 08:20:12 2011 +0000

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

ok by mrg@ jmcneill@

diffstat:

 sys/dev/pci/esa.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r c3b332cf9132 -r fa305d26ee8c sys/dev/pci/esa.c
--- a/sys/dev/pci/esa.c Fri Dec 02 23:57:58 2011 +0000
+++ b/sys/dev/pci/esa.c Sat Dec 03 08:20:12 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 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;
 }