Module Name: src Committed By: nat Date: Fri Jul 28 03:58:54 UTC 2017
Modified Files: src/sys/dev: audio.c Log Message: Remove dead code from audio open. Found by isaki@. Better error handling incase memory for the streams' ringbuffers cannot be allocated. Addresses PR kern/52433. To generate a diff of this commit: cvs rdiff -u -r1.374 -r1.375 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.374 src/sys/dev/audio.c:1.375 --- src/sys/dev/audio.c:1.374 Fri Jul 28 03:29:19 2017 +++ src/sys/dev/audio.c Fri Jul 28 03:58:54 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.374 2017/07/28 03:29:19 nat Exp $ */ +/* $NetBSD: audio.c,v 1.375 2017/07/28 03:58:54 nat Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au> @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.374 2017/07/28 03:29:19 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.375 2017/07/28 03:58:54 nat Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -2164,13 +2164,6 @@ audio_open(dev_t dev, struct audio_softc DPRINTF(("audio_open: flags=0x%x sc=%p hdl=%p\n", flags, sc, sc->hw_hdl)); - if (((flags & FREAD) && (vc->sc_open & AUOPEN_READ)) || - ((flags & FWRITE) && (vc->sc_open & AUOPEN_WRITE))) { - kmem_free(vc, sizeof(struct virtual_channel)); - kmem_free(chan, sizeof(struct audio_chan)); - return EBUSY; - } - error = audio_alloc_ring(sc, &vc->sc_mpr, AUMODE_PLAY, AU_RING_SIZE); if (!error) { @@ -2178,6 +2171,8 @@ audio_open(dev_t dev, struct audio_softc AUMODE_RECORD, AU_RING_SIZE); } if (error) { + audio_free_ring(sc, &vc->sc_mrr); + audio_free_ring(sc, &vc->sc_mpr); kmem_free(vc, sizeof(struct virtual_channel)); kmem_free(chan, sizeof(struct audio_chan)); return error;