From afa2a998d54b34ef9fb897a0d75b4837f36c8cfd Mon Sep 17 00:00:00 2001 From: skrll Date: Sun, 5 Jul 2015 15:51:55 +0000 Subject: Revert patch from PR/48715 as it is incorrect. --- sys/dev/usb/umodem.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'sys/dev') 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 -__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 #include @@ -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); -- cgit