[src/netbsd-6]: src/sys/dev Pull up following revision(s) (requested by nonak...

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

details:   https://anonhg.NetBSD.org/src/rev/7959c3bf7560
branches:  netbsd-6
changeset: 773801:7959c3bf7560
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Feb 23 18:23:03 2012 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #25):
        sys/dev/audio.c: revision 1.258
kern/45927: fix incorrect assert.

diffstat:

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

diffs (27 lines):

diff -r 184124210a8d -r 7959c3bf7560 sys/dev/audio.c
--- a/sys/dev/audio.c   Thu Feb 23 02:31:50 2012 +0000
+++ b/sys/dev/audio.c   Thu Feb 23 18:23:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.257 2011/12/13 12:26:32 mrg Exp $  */
+/*     $NetBSD: audio.c,v 1.257.2.1 2012/02/23 18:23:03 riz Exp $      */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.257 2011/12/13 12:26:32 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.257.2.1 2012/02/23 18:23:03 riz Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -2678,7 +2678,7 @@
        paddr_t rv;
 
        KASSERT(mutex_owned(sc->sc_lock));
-       KASSERT(sc->sc_dvlock < 0);
+       KASSERT(sc->sc_dvlock > 0);
 
        DPRINTF(("audio_mmap: off=%lld, prot=%d\n", (long long)off, prot));
        hw = sc->hw_if;