Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[pandora-kernel.git] / drivers / usb / host / xhci.c

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index f5fe1ac..763f484 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1342,8 +1342,8 @@ int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
        /* If the HC already knows the endpoint is disabled,
         * or the HCD has noted it is disabled, ignore this request
         */
-       if ((le32_to_cpu(ep_ctx->ep_info) & EP_STATE_MASK) ==
-           EP_STATE_DISABLED ||
+       if (((ep_ctx->ep_info & cpu_to_le32(EP_STATE_MASK)) ==
+            cpu_to_le32(EP_STATE_DISABLED)) ||
            le32_to_cpu(ctrl_ctx->drop_flags) &
            xhci_get_endpoint_flag(&ep->desc)) {
                xhci_warn(xhci, "xHCI %s called with disabled ep %p\n",
@@ -1758,8 +1758,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
                /* Enqueue pointer can be left pointing to the link TRB,
                 * we must handle that
                 */
-               if ((le32_to_cpu(command->command_trb->link.control)
-                    & TRB_TYPE_BITMASK) == TRB_TYPE(TRB_LINK))
+               if (TRB_TYPE_LINK_LE32(command->command_trb->link.control))
                        command->command_trb =
                                xhci->cmd_ring->enq_seg->next->trbs;
 
@@ -2559,8 +2558,7 @@ int xhci_discover_or_reset_device(struct usb_hcd *hcd, struct usb_device *udev)
        /* Enqueue pointer can be left pointing to the link TRB,
         * we must handle that
         */
-       if ((le32_to_cpu(reset_device_cmd->command_trb->link.control)
-            & TRB_TYPE_BITMASK) == TRB_TYPE(TRB_LINK))
+       if (TRB_TYPE_LINK_LE32(reset_device_cmd->command_trb->link.control))
                reset_device_cmd->command_trb =
                        xhci->cmd_ring->enq_seg->next->trbs;