Module Name: src
Committed By: mrg
Date: Sun Nov 20 08:40:52 UTC 2011
Modified Files:
src/sys/dev/isa [jmcneill-audiomp3]: ess.c
Log Message:
make sure to return from the end of essattach() before destroying
the callouts and mutexes. with an uncommited audio.c change, i can
now play audio on my shark with the branch.
To generate a diff of this commit:
cvs rdiff -u -r1.78.10.1 -r1.78.10.2 src/sys/dev/isa/ess.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/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.78.10.1 src/sys/dev/isa/ess.c:1.78.10.2
--- src/sys/dev/isa/ess.c:1.78.10.1 Sat Nov 19 21:49:37 2011
+++ src/sys/dev/isa/ess.c Sun Nov 20 08:40:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.78.10.1 2011/11/19 21:49:37 jmcneill Exp $ */
+/* $NetBSD: ess.c,v 1.78.10.2 2011/11/20 08:40:52 mrg Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.78.10.1 2011/11/19 21:49:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.78.10.2 2011/11/20 08:40:52 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1076,6 +1076,8 @@ essattach(struct ess_softc *sc, int enab
ess_printsc(sc);
#endif
+ return;
+
fail:
callout_destroy(&sc->sc_poll1_ch);
callout_destroy(&sc->sc_poll2_ch);
