Module Name: src
Committed By: riz
Date: Thu Feb 23 18:23:03 UTC 2012
Modified Files:
src/sys/dev [netbsd-6]: audio.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #25):
sys/dev/audio.c: revision 1.258
kern/45927: fix incorrect assert.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.257.2.1 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.257 src/sys/dev/audio.c:1.257.2.1
--- src/sys/dev/audio.c:1.257 Tue Dec 13 12:26:32 2011
+++ src/sys/dev/audio.c Thu Feb 23 18:23:03 2012
@@ -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 @@ audio_mmap(struct audio_softc *sc, off_t
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;
