Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (143 commits) USB: xhci depends on PCI. USB: xhci: Add Makefile, MAINTAINERS, and Kconfig entries. USB: xhci: Respect critical sections. USB: xHCI: Fix interrupt moderation. USB: xhci: Remove packed attribute from structures. usb; xhci: Fix TRB offset calculations. USB: xhci: replace if-elseif-else with switch-case USB: xhci: Make xhci-mem.c include linux/dmapool.h USB: xhci: drop spinlock in xhci_urb_enqueue() error path. USB: Change names of SuperSpeed ep companion descriptor structs. USB: xhci: Avoid compiler reordering in Link TRB giveback. USB: xhci: Clean up xhci_irq() function. USB: xhci: Avoid global namespace pollution. USB: xhci: Fix Link TRB handoff bit twiddling. USB: xhci: Fix register write order. USB: xhci: fix some compiler warnings in xhci.h USB: xhci: fix lots of compiler warnings. USB: xhci: use xhci_handle_event instead of handle_event USB: xhci: URB cancellation support. USB: xhci: Scatter gather list support for bulk transfers. ...
This commit is contained in:
@@ -485,7 +485,7 @@ static int at91_ep_enable(struct usb_ep *_ep,
|
||||
return -ESHUTDOWN;
|
||||
}
|
||||
|
||||
tmp = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
|
||||
tmp = usb_endpoint_type(desc);
|
||||
switch (tmp) {
|
||||
case USB_ENDPOINT_XFER_CONTROL:
|
||||
DBG("only one control endpoint\n");
|
||||
@@ -517,7 +517,7 @@ ok:
|
||||
local_irq_save(flags);
|
||||
|
||||
/* initialize endpoint to match this descriptor */
|
||||
ep->is_in = (desc->bEndpointAddress & USB_DIR_IN) != 0;
|
||||
ep->is_in = usb_endpoint_dir_in(desc);
|
||||
ep->is_iso = (tmp == USB_ENDPOINT_XFER_ISOC);
|
||||
ep->stopped = 0;
|
||||
if (ep->is_in)
|
||||
|
Reference in New Issue
Block a user