From 709c470f238e7dab198fd5f53715cfa1735c9ea4 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 29 Dec 2008 00:21:07 +0000 Subject: [PATCH] --- yaml --- r: 124004 b: refs/heads/master c: f201a8a4511a4c9953189924df3c880207194b41 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/hso.c | 2 +- trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7b7d27bb4c72..9e33d2441838 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68ce9c0e3411b430b9800015e318af9f96933aa0 +refs/heads/master: f201a8a4511a4c9953189924df3c880207194b41 diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c index 198ce3cf378a..9f7896a25f1b 100644 --- a/trunk/drivers/net/usb/hso.c +++ b/trunk/drivers/net/usb/hso.c @@ -2831,7 +2831,7 @@ static struct usb_endpoint_descriptor *hso_get_ep(struct usb_interface *intf, for (i = 0; i < iface->desc.bNumEndpoints; i++) { endp = &iface->endpoint[i].desc; if (((endp->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == dir) && - ((endp->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == type)) + (usb_endpoint_type(endp) == type)) return endp; } diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_usb.c b/trunk/drivers/net/wireless/zd1211rw/zd_usb.c index 04c139666965..b5db57d2fcf5 100644 --- a/trunk/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/trunk/drivers/net/wireless/zd1211rw/zd_usb.c @@ -1065,8 +1065,7 @@ static int eject_installer(struct usb_interface *intf) /* Find bulk out endpoint */ endpoint = &iface_desc->endpoint[1].desc; if ((endpoint->bEndpointAddress & USB_TYPE_MASK) == USB_DIR_OUT && - (endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == - USB_ENDPOINT_XFER_BULK) { + usb_endpoint_xfer_bulk(endpoint)) { bulk_out_ep = endpoint->bEndpointAddress; } else { dev_err(&udev->dev,