 @@ -1,14 +1,14 @@
-/*	$NetBSD: ossaudio.c,v 1.58 2020/10/24 14:43:53 roy Exp $	*/
+/*	$NetBSD: ossaudio.c,v 1.59 2020/10/30 21:44:49 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.58 2020/10/24 14:43:53 roy Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.59 2020/10/30 21:44:49 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>
 @@ -170,56 +170,35 @@ audio_ioctl(int fd, unsigned long com, v
 		break;
 	case SNDCTL_DSP_COOKEDMODE:
 		/*
 		 * NetBSD is always running in "cooked mode" - the kernel
 		 * always performs format conversions.
 		 */
 		INTARG = 1;
 		break;
 	case SNDCTL_DSP_POST:
 		/* This call is merely advisory, and may be a nop. */
 		break;
 	case SNDCTL_DSP_SPEED:
 		AUDIO_INITINFO(&tmpinfo);
 		/* Conform to kernel limits. */
 		if (INTARG < 1000)
 			INTARG = 1000;
 		if (INTARG > 192000)
 			INTARG = 192000;
 		tmpinfo.play.sample_rate =
 		tmpinfo.record.sample_rate = INTARG;
 		/*
 		 * The default NetBSD behavior if an unsupported sample rate
 		 * is set is to return an error code and keep the rate at the
 		 * default of 8000 Hz.
 		 * However, OSS specifies that a sample rate supported by the
 		 * hardware is returned if the exact rate could not be set.
 		 * So, if the chosen sample rate is invalid, set and return
 		 * the current hardware rate.
 		 */
 		if (ioctl(fd, AUDIO_SETINFO, &tmpinfo) < 0) {
-			/* Don't care that SETINFO failed the first time... */
+			return retval;
 			errno = 0;
 			retval = ioctl(fd, AUDIO_GETFORMAT, &hwfmt);
 			if (retval < 0)
 				return retval;
 			retval = ioctl(fd, AUDIO_GETINFO, &tmpinfo);
 			if (retval < 0)
 				return retval;
 			tmpinfo.play.sample_rate =
 			tmpinfo.record.sample_rate =
 			    (tmpinfo.mode == AUMODE_RECORD) ?
 			    hwfmt.record.sample_rate :
 			    hwfmt.play.sample_rate;
 			retval = ioctl(fd, AUDIO_SETINFO, &tmpinfo);
 			if (retval < 0)
 				return retval;
+		}
 		/* FALLTHRU */
 	case SOUND_PCM_READ_RATE:
 		retval = ioctl(fd, AUDIO_GETBUFINFO, &tmpinfo);
 		if (retval < 0)
 			return retval;
 		INTARG = GETPRINFO(&tmpinfo, sample_rate);
 		break;
 	case SNDCTL_DSP_STEREO:
 		AUDIO_INITINFO(&tmpinfo);
 		tmpinfo.play.channels =
 		tmpinfo.record.channels = INTARG ? 2 : 1;
 		(void) ioctl(fd, AUDIO_SETINFO, &tmpinfo);