The branch main has been updated by zlei:
URL:
https://cgit.FreeBSD.org/src/commit/?id=95b2d16b38a720108a51f9e8ce0685244e3e3ea4
commit 95b2d16b38a720108a51f9e8ce0685244e3e3ea4
Author: Zhenlei Huang <z...@freebsd.org>
AuthorDate: 2023-03-17 17:24:46 +0000
Commit: Zhenlei Huang <z...@freebsd.org>
CommitDate: 2023-03-17 17:30:18 +0000
ehci(4): Correct PCI device ID for Zhaoxin USB 2.0 controller
And minor style fixes.
Tested by: Weitao Wang <weitaowang...@zhaoxin.com>
Fixes: f9237e1937a4 ehci(4): Add new USB IDs
Differential Revision: https://reviews.freebsd.org/D38923
---
sys/dev/usb/controller/ehci_pci.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys/dev/usb/controller/ehci_pci.c
b/sys/dev/usb/controller/ehci_pci.c
index a4430aa3a05d..3b332516f933 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -96,7 +96,7 @@ __FBSDID("$FreeBSD$");
#define PCI_EHCI_VENDORID_NVIDIA2 0x10DE
#define PCI_EHCI_VENDORID_VIA 0x1106
#define PCI_EHCI_VENDORID_VMWARE 0x15ad
-#define PCI_EHCI_VENDORID_ZHAOXIN 0x1d17
+#define PCI_EHCI_VENDORID_ZHAOXIN 0x1d17
static device_probe_t ehci_pci_probe;
static device_attach_t ehci_pci_attach;
@@ -226,8 +226,8 @@ ehci_pci_match(device_t self)
case 0x077015ad:
return ("VMware USB 2.0 controller");
- case 0x1d173104:
- return ("Zhaoxin ZX-100/ZX-200/ZX-E USB 2.0 controller");
+ case 0x31041d17:
+ return ("Zhaoxin ZX-100/ZX-200/ZX-E USB 2.0 controller");
default:
break;
@@ -414,9 +414,9 @@ ehci_pci_attach(device_t self)
case PCI_EHCI_VENDORID_VMWARE:
sprintf(sc->sc_vendor, "VMware");
break;
- case PCI_EHCI_VENDORID_ZHAOXIN:
- sprintf(sc->sc_vendor, "Zhaoxin");
- break;
+ case PCI_EHCI_VENDORID_ZHAOXIN:
+ sprintf(sc->sc_vendor, "Zhaoxin");
+ break;
default:
if (bootverbose)
device_printf(self, "(New EHCI DeviceId=0x%08x)\n",
