Module Name: src
Committed By: skrll
Date: Sun Jul 5 15:51:55 UTC 2015
Modified Files:
src/sys/dev/usb: umodem.c
Log Message:
Revert patch from PR/48715 as it is incorrect.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/umodem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umodem.c
diff -u src/sys/dev/usb/umodem.c:1.66 src/sys/dev/usb/umodem.c:1.67
--- src/sys/dev/usb/umodem.c:1.66 Sun Apr 6 02:01:43 2014
+++ src/sys/dev/usb/umodem.c Sun Jul 5 15:51:55 2015
@@ -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 m
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);
