From f772d57c3a76deb2d2f5413b41325b04fe3d312c Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Wed, 15 Apr 2009 22:28:21 +0200 Subject: [PATCH] --- yaml --- r: 151327 b: refs/heads/master c: 9ab1565151dff37a7d7687bfe5cfafb62c7d5e49 h: refs/heads/master i: 151325: 8155558cf8564fd0a8d61e0f18873aae1a178f5c 151323: ab4dce7a2eba895433dd2403776b158d8b4b8022 151319: ccd61f5c94aee6f19b60af58eabfe7b9360c3204 151311: 3801eb331ba41e975f9c2e9c948550774f725727 151295: 9379522ec0358d98d35d9b66707d8ba8d6019036 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/goku_udc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ac2a97105272..9670fd02a98b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81c8d8d28d6f2750acd4e41de34aefeb9404431c +refs/heads/master: 9ab1565151dff37a7d7687bfe5cfafb62c7d5e49 diff --git a/trunk/drivers/usb/gadget/goku_udc.c b/trunk/drivers/usb/gadget/goku_udc.c index de010c939dbb..112bb40a427c 100644 --- a/trunk/drivers/usb/gadget/goku_udc.c +++ b/trunk/drivers/usb/gadget/goku_udc.c @@ -110,10 +110,10 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) return -EINVAL; if (!dev->driver || dev->gadget.speed == USB_SPEED_UNKNOWN) return -ESHUTDOWN; - if (ep->num != (desc->bEndpointAddress & 0x0f)) + if (ep->num != usb_endpoint_num(desc)) return -EINVAL; - switch (desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) { + switch (usb_endpoint_type(desc)) { case USB_ENDPOINT_XFER_BULK: case USB_ENDPOINT_XFER_INT: break; @@ -142,7 +142,7 @@ goku_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) /* ep1/ep2 dma direction is chosen early; it works in the other * direction, with pio. be cautious with out-dma. */ - ep->is_in = (USB_DIR_IN & desc->bEndpointAddress) != 0; + ep->is_in = usb_endpoint_dir_in(desc); if (ep->is_in) { mode |= 1; ep->dma = (use_dma != 0) && (ep->num == UDC_MSTRD_ENDPOINT);