1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index d67ff71209f5..749fc68eb5c1 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1433,8 +1433,11 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
                 xhci_handle_cmd_reset_ep(xhci, slot_id, cmd_trb, cmd_comp_code);
                 break;
         case TRB_RESET_DEV:
-                WARN_ON(slot_id != TRB_TO_SLOT_ID(
-                                le32_to_cpu(cmd_trb->generic.field[3])));
+                /* SLOT_ID field in reset device cmd completion event TRB is 0.
+                 * Use the SLOT_ID from the command TRB instead (xhci 4.6.11)
+                 */
+                slot_id = TRB_TO_SLOT_ID(
+                                le32_to_cpu(cmd_trb->generic.field[3]));
                 xhci_handle_cmd_reset_dev(xhci, slot_id, event);
                 break;
         case TRB_NEC_GET_FW:
@@ -3534,7 +3537,7 @@ static unsigned int xhci_get_burst_count(struct xhci_hcd *xhci,
                 return 0;
 
         max_burst = urb->ep->ss_ep_comp.bMaxBurst;
-        return roundup(total_packet_count, max_burst + 1) - 1;
+        return DIV_ROUND_UP(total_packet_count, max_burst + 1) - 1;
 }
 
 /*