Module Name: src Committed By: mrg Date: Fri Dec 9 05:08:25 UTC 2011
Modified Files: src/sys/dev: audio.c Log Message: drop the thread lock in a couple of error cases that were missing. To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 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.255 src/sys/dev/audio.c:1.256 --- src/sys/dev/audio.c:1.255 Fri Nov 25 03:13:06 2011 +++ src/sys/dev/audio.c Fri Dec 9 05:08:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.255 2011/11/25 03:13:06 jakllsch Exp $ */ +/* $NetBSD: audio.c,v 1.256 2011/12/09 05:08:25 mrg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -155,7 +155,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.255 2011/11/25 03:13:06 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.256 2011/12/09 05:08:25 mrg Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -464,6 +464,7 @@ audioattach(device_t parent, device_t se AUMODE_PLAY, AU_RING_SIZE); if (error) { sc->hw_if = NULL; + mutex_exit(sc->sc_lock); aprint_error("audio: could not allocate play buffer\n"); return; } @@ -475,6 +476,7 @@ audioattach(device_t parent, device_t se if (sc->sc_pr.s.start != 0) audio_free_ring(sc, &sc->sc_pr); sc->hw_if = NULL; + mutex_exit(sc->sc_lock); aprint_error("audio: could not allocate record buffer\n"); return; }