[src/jmcneill-audiomp3]: src/sys/dev/isa make sure to return from the end of ...

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

details:   https://anonhg.NetBSD.org/src/rev/eecd6ce131f9
branches:  jmcneill-audiomp3
changeset: 771330:eecd6ce131f9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 20 08:40:52 2011 +0000

description:
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.

diffstat:

 sys/dev/isa/ess.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 7e000305319b -r eecd6ce131f9 sys/dev/isa/ess.c
--- a/sys/dev/isa/ess.c Sun Nov 20 08:39:59 2011 +0000
+++ b/sys/dev/isa/ess.c Sun Nov 20 08:40:52 2011 +0000
@@ -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 @@
                ess_printsc(sc);
 #endif
 
+       return;
+
  fail:
        callout_destroy(&sc->sc_poll1_ch);
        callout_destroy(&sc->sc_poll2_ch);