 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_ioctl.c,v 1.14 2019/08/23 12:49:59 maxv Exp $ */
+/*	$NetBSD: linux32_ioctl.c,v 1.14.8.1 2021/01/03 16:14:04 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -22,40 +22,43 @@
  * 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 AUTHOR 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>
-__KERNEL_RCSID(0, "$NetBSD: linux32_ioctl.c,v 1.14 2019/08/23 12:49:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_ioctl.c,v 1.14.8.1 2021/01/03 16:14:04 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/ucred.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_signal.h>
 #include <compat/linux/common/linux_ipc.h>
 #include <compat/linux/common/linux_ioctl.h>
 #include <compat/linux/common/linux_sem.h>
 #include <compat/linux/linux_syscallargs.h>
 #include <compat/linux32/common/linux32_types.h>
 #include <compat/linux32/common/linux32_signal.h>
 #include <compat/linux32/common/linux32_ioctl.h>
 #include <compat/linux32/common/linux32_termios.h>
 #include <compat/linux32/common/linux32_sysctl.h>
 #include <compat/linux32/linux32_syscallargs.h>
 #include <compat/ossaudio/ossaudio.h>
 #include <compat/ossaudio/ossaudiovar.h>
 @@ -70,28 +73,51 @@ linux32_sys_ioctl(struct lwp *l, const s
 	struct oss_sys_ioctl_args ossuap;
 	int group;
 	int error;
 	group = LINUX32_IOCGROUP((int)SCARG(uap, com));
 #ifdef DEBUG_LINUX
 	printf("linux32_sys_ioctl(%d, 0x%x/\'%c\', %p)\n", SCARG(uap, fd),
 	    SCARG(uap, com), (char)group, SCARG_P32(uap, data));
 #endif
 	switch(group) {
 	case 'T':
 		error = linux32_ioctl_termios(l, uap, retval);
 		/*
 		 * Termios, the MIDI sequencer, and timerfd use 'T' to
 		 * identify the ioctl, so we have to differentiate them
 		 * in another way.
+		 *
 		 * (XXX We don't bother with MIDI here.)
 		 */
 		struct file *fp;
 		if ((fp = fd_getfile(SCARG(uap, fd))) == NULL)
 			return EBADF;
 		if (fp->f_type == DTYPE_TIMERFD) {
 			struct linux_sys_ioctl_args ua;
 			SCARG(&ua, fd) = SCARG(uap, fd);
 			SCARG(&ua, com) = SCARG(uap, com);
 			SCARG(&ua, data) = SCARG_P32(uap, data);
 			error = linux_ioctl_timerfd(l, &ua, retval);
 		} else {
 			error = linux32_ioctl_termios(l, uap, retval);
+		}
 		fd_putfile(SCARG(uap, fd));
 		break;
+	    }
 	case 'M':
 	case 'Q':
 	case 'P':
 		SCARG(&ossuap, fd) = SCARG(uap, fd);
 		SCARG(&ossuap, com) = (u_long)SCARG(uap, com);
 		SCARG(&ossuap, data) = SCARG_P32(uap, data);
 		switch (group) {
 		case 'M':
 			error = oss_ioctl_mixer(l, &ossuap, retval);
 			break;
 		case 'Q':
 			error = oss_ioctl_sequencer(l, &ossuap, retval);
 			break;