 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.65 2020/12/19 12:55:28 nia Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.66 2021/03/15 10:58:05 nia Exp $	*/
 /*-
  * Copyright (c) 1997, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ossaudio.c,v 1.65 2020/12/19 12:55:28 nia Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.66 2021/03/15 10:58:05 nia Exp $");
 /*
  * This is an Open Sound System compatibility layer, which provides
  * fairly complete ioctl emulation for OSSv3 and some of OSSv4.
+ *
  * The canonical OSS specification is available at
  * http://manuals.opensound.com/developer/
+ *
  * This file is similar to sys/compat/ossaudio.c with additional OSSv4
  * compatibility.
  */
 #include <string.h>
 @@ -1432,26 +1432,27 @@ mixer_oss4_ioctl(int fd, unsigned long c
 			return -1;
+		}
 		snprintf(devname, sizeof(devname), "/dev/mixer%d", mv->dev);
 		if ((newfd = open(devname, O_RDWR)) < 0)
 			return newfd;
 		mdi.index = mc.dev = mv->ctrl - 1;
 		retval = ioctl(newfd, AUDIO_MIXER_DEVINFO, &mdi);
 		if (retval < 0) {
 			tmperrno = errno;
 			close(newfd);
 			errno = tmperrno;
 			return retval;
+		}
 		mc.type = mdi.type;
 		switch (mdi.type) {
 		case AUDIO_MIXER_ENUM:
 			if (mv->value >= mdi.un.e.num_mem) {
 				close(newfd);
 				errno = EINVAL;
 				return -1;
+			}
 			mc.un.ord = mdi.un.e.member[mv->value].ord;
 			break;
 		case AUDIO_MIXER_SET:
 			if (mv->value >= mdi.un.s.num_mem) {
 				close(newfd);
 				errno = EINVAL;
 @@ -1459,26 +1460,27 @@ mixer_oss4_ioctl(int fd, unsigned long c
+			}
 #ifdef notyet
 			mc.un.mask = 0;
 			for (i = 0; i < mdi.un.s.num_mem; ++i) {
 				if (mv->value & (1 << i)) {
 					mc.un.mask |= mdi.un.s.member[mv->value].mask;
+				}
+			}
 #else
 			mc.un.mask = mdi.un.s.member[mv->value].mask;
 #endif
 			break;
 		case AUDIO_MIXER_VALUE:
 			mc.un.value.num_channels = mdi.un.v.num_channels;
 			if (mdi.un.v.num_channels != 2) {
 				for (i = 0; i < mdi.un.v.num_channels; ++i) {
 					mc.un.value.level[i] = mv->value;
+				}
 			} else {
 			    mc.un.value.level[AUDIO_MIXER_LEVEL_LEFT] =
 				(mv->value >> 0) & 0xFF;
 			    mc.un.value.level[AUDIO_MIXER_LEVEL_RIGHT] =
 				(mv->value >> 8) & 0xFF;
+			}
 			break;
+		}
 		retval = ioctl(newfd, AUDIO_MIXER_WRITE, &mc);
 @@ -1502,26 +1504,29 @@ mixer_oss4_ioctl(int fd, unsigned long c
+		}
 		snprintf(devname, sizeof(devname), "/dev/mixer%d", mv->dev);
 		if ((newfd = open(devname, O_RDWR)) < 0)
 			return newfd;
 		mdi.index = mc.dev = (mv->ctrl - 1);
 		retval = ioctl(newfd, AUDIO_MIXER_DEVINFO, &mdi);
 		if (retval < 0) {
 			tmperrno = errno;
 			close(newfd);
 			errno = tmperrno;
 			return retval;
+		}
 		mc.dev = mdi.index;
 		mc.type = mdi.type;
 		if (mdi.type == AUDIO_MIXER_VALUE)
 			mc.un.value.num_channels = mdi.un.v.num_channels;
 		retval = ioctl(newfd, AUDIO_MIXER_READ, &mc);
 		if (retval < 0) {
 			tmperrno = errno;
 			close(newfd);
 			errno = tmperrno;
 			return retval;
+		}
 		close(newfd);
 		mv->value = 0;
 		switch (mdi.type) {
 		case AUDIO_MIXER_ENUM:
 			for (i = 0; i < mdi.un.e.num_mem; ++i) {
 				if (mc.un.ord == mdi.un.e.member[i].ord) {