summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2015-07-05 15:51:55 +0000
committerskrll <skrll@NetBSD.org>2015-07-05 15:51:55 +0000
commitafa2a998d54b34ef9fb897a0d75b4837f36c8cfd (patch)
tree12f21fc9fdc394a6872b8d98712917a44b9dbeb3 /sys/dev/usb
parent967f2f899a89fc3a6a87938b013ba0856917abaf (diff)
Revert patch from PR/48715 as it is incorrect.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/umodem.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 0b33e20267f..ed551881730 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.66 2014/04/06 02:01:43 christos Exp $ */
+/* $NetBSD: umodem.c,v 1.67 2015/07/05 15:51:55 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.66 2014/04/06 02:01:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.67 2015/07/05 15:51:55 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,17 +98,12 @@ umodem_match(device_t parent, cfdata_t match, void *aux)
usb_interface_descriptor_t *id;
int cm, acm;
- id = usbd_get_interface_descriptor(uaa->iface);
- if (uaa->subclass != UISUBCLASS_ABSTRACT_CONTROL_MODEL &&
- (id->bInterfaceClass == UICLASS_CDC_DATA &&
- id->bInterfaceSubClass == UISUBCLASS_DATA))
- return (UMATCH_IFACECLASS_IFACESUBCLASS);
-
if (uaa->class != UICLASS_CDC ||
uaa->subclass != UISUBCLASS_ABSTRACT_CONTROL_MODEL ||
!(uaa->proto == UIPROTO_CDC_NOCLASS || uaa->proto == UIPROTO_CDC_AT))
return (UMATCH_NONE);
+ id = usbd_get_interface_descriptor(uaa->iface);
if (umodem_get_caps(uaa->device, &cm, &acm, id) == -1)
return (UMATCH_NONE);