[src/trunk]: src/sys/dev/usb Revert patch from PR/48715 as it is incorrect.

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ae308bb96624
branches:  trunk
changeset: 809357:ae308bb96624
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Jul 05 15:51:55 2015 +0000

description:
Revert patch from PR/48715 as it is incorrect.

diffstat:

 sys/dev/usb/umodem.c |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 19c56ed7f435 -r ae308bb96624 sys/dev/usb/umodem.c
--- a/sys/dev/usb/umodem.c      Sun Jul 05 08:14:46 2015 +0000
+++ b/sys/dev/usb/umodem.c      Sun Jul 05 15:51:55 2015 +0000
@@ -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 @@
        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);