Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert patch from PR/48715 as it is incorrect.

Browse Source
This commit is contained in:
skrll 2015-07-05 15:51:55 +00:00
parent dd1f67f596
commit 4626b350f6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/usb/umodem.c
View File

@ -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);