diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 4 | ||||
-rw-r--r-- | drivers/usb/host/xhci.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/xhci.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index c60617bb8c2..23b4aefd103 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -3609,12 +3609,12 @@ int xhci_queue_configure_endpoint(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, | |||
3609 | 3609 | ||
3610 | /* Queue an evaluate context command TRB */ | 3610 | /* Queue an evaluate context command TRB */ |
3611 | int xhci_queue_evaluate_context(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, | 3611 | int xhci_queue_evaluate_context(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, |
3612 | u32 slot_id) | 3612 | u32 slot_id, bool command_must_succeed) |
3613 | { | 3613 | { |
3614 | return queue_command(xhci, lower_32_bits(in_ctx_ptr), | 3614 | return queue_command(xhci, lower_32_bits(in_ctx_ptr), |
3615 | upper_32_bits(in_ctx_ptr), 0, | 3615 | upper_32_bits(in_ctx_ptr), 0, |
3616 | TRB_TYPE(TRB_EVAL_CONTEXT) | SLOT_ID_FOR_TRB(slot_id), | 3616 | TRB_TYPE(TRB_EVAL_CONTEXT) | SLOT_ID_FOR_TRB(slot_id), |
3617 | false); | 3617 | command_must_succeed); |
3618 | } | 3618 | } |
3619 | 3619 | ||
3620 | /* | 3620 | /* |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 16c05c6b5af..05034f346fa 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
@@ -2446,7 +2446,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, | |||
2446 | udev->slot_id, must_succeed); | 2446 | udev->slot_id, must_succeed); |
2447 | else | 2447 | else |
2448 | ret = xhci_queue_evaluate_context(xhci, in_ctx->dma, | 2448 | ret = xhci_queue_evaluate_context(xhci, in_ctx->dma, |
2449 | udev->slot_id); | 2449 | udev->slot_id, must_succeed); |
2450 | if (ret < 0) { | 2450 | if (ret < 0) { |
2451 | if (command) | 2451 | if (command) |
2452 | list_del(&command->cmd_list); | 2452 | list_del(&command->cmd_list); |
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 58d527ccb24..59248449b25 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1757,7 +1757,7 @@ int xhci_queue_isoc_tx_prepare(struct xhci_hcd *xhci, gfp_t mem_flags, | |||
1757 | int xhci_queue_configure_endpoint(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, | 1757 | int xhci_queue_configure_endpoint(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, |
1758 | u32 slot_id, bool command_must_succeed); | 1758 | u32 slot_id, bool command_must_succeed); |
1759 | int xhci_queue_evaluate_context(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, | 1759 | int xhci_queue_evaluate_context(struct xhci_hcd *xhci, dma_addr_t in_ctx_ptr, |
1760 | u32 slot_id); | 1760 | u32 slot_id, bool command_must_succeed); |
1761 | int xhci_queue_reset_ep(struct xhci_hcd *xhci, int slot_id, | 1761 | int xhci_queue_reset_ep(struct xhci_hcd *xhci, int slot_id, |
1762 | unsigned int ep_index); | 1762 | unsigned int ep_index); |
1763 | int xhci_queue_reset_device(struct xhci_hcd *xhci, u32 slot_id); | 1763 | int xhci_queue_reset_device(struct xhci_hcd *xhci, u32 slot_id); |