[src/trunk]: src/sys/dev/audio Move #if DIAGNOSTIC..#endif to correct place.

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

details:   https://anonhg.NetBSD.org/src/rev/56eb0a3197fa
branches:  trunk
changeset: 969474:56eb0a3197fa
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sat Feb 22 07:59:47 2020 +0000

description:
Move #if DIAGNOSTIC..#endif to correct place.
It should ignore stray interrupts regardless of DIAGNOSTIC.

diffstat:

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

diffs (48 lines):

diff -r 3dd7c045af17 -r 56eb0a3197fa sys/dev/audio/audio.c
--- a/sys/dev/audio/audio.c     Sat Feb 22 07:09:18 2020 +0000
+++ b/sys/dev/audio/audio.c     Sat Feb 22 07:59:47 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.48 2020/02/22 07:09:18 isaki Exp $ */
+/*     $NetBSD: audio.c,v 1.49 2020/02/22 07:59:47 isaki Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.48 2020/02/22 07:09:18 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.49 2020/02/22 07:59:47 isaki Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -5224,12 +5224,12 @@
 
        if (sc->sc_dying)
                return;
+       if (sc->sc_pbusy == false) {
 #if defined(DIAGNOSTIC)
-       if (sc->sc_pbusy == false) {
                device_printf(sc->sc_dev, "stray interrupt\n");
+#endif
                return;
        }
-#endif
 
        mixer = sc->sc_pmixer;
        mixer->hw_complete_counter += mixer->frames_per_block;
@@ -5492,12 +5492,12 @@
 
        if (sc->sc_dying)
                return;
+       if (sc->sc_rbusy == false) {
 #if defined(DIAGNOSTIC)
-       if (sc->sc_rbusy == false) {
                device_printf(sc->sc_dev, "stray interrupt\n");
+#endif
                return;
        }
-#endif
 
        mixer = sc->sc_rmixer;
        mixer->hw_complete_counter += mixer->frames_per_block;