diff options
author | Oliver Neukum <oneukum@suse.com> | 2015-09-07 16:05:42 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-15 12:43:49 -0700 |
commit | 7b6ee48d3f4d432bfa6c9c9662fbdbd97681240e (patch) | |
tree | 5a1e2a532385a873e4ff2e2a23811562bdce13a4 | |
parent | 8492ed45aa5dbb5c4f0786f90ff12d8511615505 (diff) | |
download | linux-stable-7b6ee48d3f4d432bfa6c9c9662fbdbd97681240e.tar.gz linux-stable-7b6ee48d3f4d432bfa6c9c9662fbdbd97681240e.tar.bz2 linux-stable-7b6ee48d3f4d432bfa6c9c9662fbdbd97681240e.zip |
cdc-phonet: use common parser
This moves cdc-phonet to the common parser for CDC users
to reduce code duplication.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/usb/cdc-phonet.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index 415ce8b882c6..ff2270ead2e6 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c @@ -340,32 +340,13 @@ static int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *i u8 *data; int phonet = 0; int len, err; + struct usb_cdc_parsed_header hdr; data = intf->altsetting->extra; len = intf->altsetting->extralen; - while (len >= 3) { - u8 dlen = data[0]; - if (dlen < 3) - return -EINVAL; - - /* bDescriptorType */ - if (data[1] == USB_DT_CS_INTERFACE) { - /* bDescriptorSubType */ - switch (data[2]) { - case USB_CDC_UNION_TYPE: - if (union_header || dlen < 5) - break; - union_header = - (struct usb_cdc_union_desc *)data; - break; - case 0xAB: - phonet = 1; - break; - } - } - data += dlen; - len -= dlen; - } + cdc_parse_cdc_header(&hdr, intf, data, len); + union_header = hdr.usb_cdc_union_desc; + phonet = hdr.phonet_magic_present; if (!union_header || !phonet) return -EINVAL; |