summaryrefslogtreecommitdiff
path: root/sys/dev/usb/udcf.c
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2008-07-10 13:48:55 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2008-07-10 13:48:55 +0000
commitb8271562e76d5f4318b8953026e3b35202323b1a (patch)
tree89ee342b7927b9087985792644d724bb13e30961 /sys/dev/usb/udcf.c
parent0a51d216c6c78003cce9eaadac600f87ce1ddd18 (diff)
Don't terminate the array of matching product/vendor IDs with { 0, 0 }
when usb_lookup is used. If a device indeed has 0 as vendor and product ID, like the HP DL165 BMC Server Engines SE USB Device, a wrong driver will attach and the machine will most pbly crash. Problem reported Rivo Nurges <rix@estpak.ee> cvs: ----------------------------------------------------------------------
Diffstat (limited to 'sys/dev/usb/udcf.c')
-rw-r--r--sys/dev/usb/udcf.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 9500b2cd58a..711b18fbaa7 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udcf.c,v 1.43 2008/07/06 10:00:47 mbalmer Exp $ */
+/* $OpenBSD: udcf.c,v 1.44 2008/07/10 13:48:54 mbalmer Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -160,8 +160,7 @@ const struct cfattach udcf_ca = {
static const struct usb_devno udcf_devs[] = {
{ USB_VENDOR_GUDE, USB_PRODUCT_GUDE_DCF },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_DCF },
- { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_HBG },
- { 0, 0 }
+ { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_HBG }
};
int