Module Name: src
Committed By: isaki
Date: Sat Feb 22 06:36:07 UTC 2020
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
Change two aprint_error_dev() to device_printf() (and improve messages).
This is also called from other than boot.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/audio/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/audio.c
diff -u src/sys/dev/audio/audio.c:1.45 src/sys/dev/audio/audio.c:1.46
--- src/sys/dev/audio/audio.c:1.45 Sat Feb 22 06:28:10 2020
+++ src/sys/dev/audio/audio.c Sat Feb 22 06:36:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.45 2020/02/22 06:28:10 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.46 2020/02/22 06:36:07 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.45 2020/02/22 06:28:10 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.46 2020/02/22 06:36:07 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -5944,8 +5944,9 @@ audio_mixers_init(struct audio_softc *sc
}
error = audio_mixer_init(sc, AUMODE_PLAY, phwfmt, pfil);
if (error) {
- aprint_error_dev(sc->sc_dev,
- "configuring playback mode failed\n");
+ device_printf(sc->sc_dev,
+ "configuring playback mode failed with %d\n",
+ error);
kmem_free(sc->sc_pmixer, sizeof(*sc->sc_pmixer));
sc->sc_pmixer = NULL;
return error;
@@ -5962,8 +5963,9 @@ audio_mixers_init(struct audio_softc *sc
}
error = audio_mixer_init(sc, AUMODE_RECORD, rhwfmt, rfil);
if (error) {
- aprint_error_dev(sc->sc_dev,
- "configuring record mode failed\n");
+ device_printf(sc->sc_dev,
+ "configuring record mode failed with %d\n",
+ error);
kmem_free(sc->sc_rmixer, sizeof(*sc->sc_rmixer));
sc->sc_rmixer = NULL;
return error;
