From 8f96bfb9cccf3b97be271eab8ebf7bf682f5eb47 Mon Sep 17 00:00:00 2001
From: riastradh <riastradh@NetBSD.org>
Date: Thu, 7 Apr 2022 17:35:31 +0000
Subject: [PATCH] ucom(4): Fix unit numbering for devsw/autoconf cross-wiring.

Should introduce a tty_unit function to use here but this'll do for
now to fix the bug I introduced in ucom(4).
---
 sys/dev/usb/ucom.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index fdd8ec566b87..c9d02ed19834 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ucom.c,v 1.130 2022/03/28 12:42:37 riastradh Exp $	*/
+/*	$NetBSD: ucom.c,v 1.131 2022/04/07 17:35:31 riastradh Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.130 2022/03/28 12:42:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.131 2022/04/07 17:35:31 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -205,6 +205,12 @@ dev_type_stop(ucomstop);
 dev_type_tty(ucomtty);
 dev_type_poll(ucompoll);
 
+static int
+ucom_unit(dev_t dev)
+{
+	return UCOMUNIT(dev);
+}
+
 const struct cdevsw ucom_cdevsw = {
 	.d_open = ucomopen,
 	.d_cancel = ucomcancel,
@@ -219,7 +225,7 @@ const struct cdevsw ucom_cdevsw = {
 	.d_kqfilter = ttykqfilter,
 	.d_discard = nodiscard,
 	.d_cfdriver = &ucom_cd,
-	.d_devtounit = dev_minor_unit,
+	.d_devtounit = ucom_unit,
 	.d_flag = D_TTY | D_MPSAFE
 };