git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
net
/
cdc_ether.c
diff --git
a/drivers/usb/net/cdc_ether.c
b/drivers/usb/net/cdc_ether.c
index
82ce035
..
44a9154
100644
(file)
--- a/
drivers/usb/net/cdc_ether.c
+++ b/
drivers/usb/net/cdc_ether.c
@@
-200,8
+200,7
@@
next_desc:
dev->status = &info->control->cur_altsetting->endpoint [0];
desc = &dev->status->desc;
dev->status = &info->control->cur_altsetting->endpoint [0];
desc = &dev->status->desc;
- if (desc->bmAttributes != USB_ENDPOINT_XFER_INT
- || !(desc->bEndpointAddress & USB_DIR_IN)
+ if (!usb_endpoint_is_int_in(desc)
|| (le16_to_cpu(desc->wMaxPacketSize)
< sizeof(struct usb_cdc_notification))
|| !desc->bInterval) {
|| (le16_to_cpu(desc->wMaxPacketSize)
< sizeof(struct usb_cdc_notification))
|| !desc->bInterval) {
@@
-498,7
+497,7
@@
static struct usb_driver cdc_driver = {
static int __init cdc_init(void)
{
static int __init cdc_init(void)
{
- BUG_ON((sizeof(((struct usbnet *)0)->data)
+ BU
ILD_BU
G_ON((sizeof(((struct usbnet *)0)->data)
< sizeof(struct cdc_state)));
return usb_register(&cdc_driver);
< sizeof(struct cdc_state)));
return usb_register(&cdc_driver);