 @@ -1,14 +1,14 @@
-/*	$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $	*/
+/*	$NetBSD: uftdi.c,v 1.79 2024/04/25 01:33:03 thorpej Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net).
+ *
  * 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.
 @@ -20,27 +20,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>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.78 2024/04/17 02:34:45 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.79 2024/04/25 01:33:03 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <dev/usb/usb.h>
 @@ -219,41 +219,53 @@ static const struct uftdi_match_quirk_en
 	 * has two interfaces, one of which is meant to act as a
 	 * regular USB serial port (interface 0), the other of which
 	 * is meant for other protocols (SWD, JTAG, etc.).  We must
 	 * reject interface 1 so that ugenif matches, thus allowing
 	 * full user-space control of that port.
 	 */
+	{
 	  .vendor_id	= USB_VENDOR_FTDI,
 	  .product_id	= USB_PRODUCT_FTDI_SERIAL_2232C,
 	  .iface_no	= 1,
 	  .vendor_str	= "SecuringHardware.com",
 	  .product_str	= "Tigard V1.1",
 	  .match_ret	= UMATCH_NONE,
 	},
 	/*
 	 * The SiPEED Tang Nano 9K (and other SiPEED Tang FPGA development
 	 * boards) have an FT2232 on-board, wired up only for JTAG.
 	 */
+	{
 	  .vendor_id	= USB_VENDOR_FTDI,
 	  .product_id	= USB_PRODUCT_FTDI_SERIAL_2232C,
 	  .iface_no	= -1,
 	  .vendor_str	= "SIPEED",
 	  .product_str	= "JTAG Debugger",
 	  .match_ret	= UMATCH_NONE,
 	},
 };
 static int
 uftdi_quirk_match(struct usbif_attach_arg *uiaa, int rv)
+{
 	struct usbd_device *dev = uiaa->uiaa_device;
 	const struct uftdi_match_quirk_entry *q;
 	int i;
 	for (i = 0; i < __arraycount(uftdi_match_quirks); i++) {
 		q = &uftdi_match_quirks[i];
 		if (uiaa->uiaa_vendor != q->vendor_id ||
 		    uiaa->uiaa_product != q->product_id ||
-		    uiaa->uiaa_ifaceno != q->iface_no) {
+		    (q->iface_no != -1 && uiaa->uiaa_ifaceno != q->iface_no)) {
 			continue;
+		}
 		if (q->vendor_str != NULL &&
 		    (dev->ud_vendor == NULL ||
 		     strcmp(dev->ud_vendor, q->vendor_str) != 0)) {
 			continue;
+		}
 		if (q->product_str != NULL &&
 		    (dev->ud_product == NULL ||
 		     strcmp(dev->ud_product, q->product_str) != 0)) {
 			continue;
+		}
 		/*