Merge "USB: xhci:Use Max packet macro to align max packet with spec"

This commit is contained in:
Linux Build Service Account 2018-02-12 04:08:21 -08:00 committed by Gerrit - the friendly Code Review server
commit 03aa6e3f42
2 changed files with 2 additions and 2 deletions

View file

@ -568,7 +568,7 @@ int xhci_check_maxpacket(struct usb_device *udev)
ctrl->devs[slot_id]->out_ctx, ep_index);
in_ctx = ctrl->devs[slot_id]->in_ctx;
ep_ctx = xhci_get_ep_ctx(ctrl, in_ctx, ep_index);
ep_ctx->ep_info2 &= cpu_to_le32(~MAX_PACKET_MASK);
ep_ctx->ep_info2 &= cpu_to_le32(~MAX_PACKET(MAX_PACKET_MASK));
ep_ctx->ep_info2 |= cpu_to_le32(MAX_PACKET(max_packet_size));
/*

View file

@ -655,7 +655,7 @@ struct xhci_ep_ctx {
#define MAX_BURST_SHIFT (8)
#define CTX_TO_MAX_BURST(p) (((p) >> 8) & 0xff)
#define MAX_PACKET(p) (((p)&0xffff) << 16)
#define MAX_PACKET_MASK (0xffff << 16)
#define MAX_PACKET_MASK (0xffff)
#define MAX_PACKET_DECODED(p) (((p) >> 16) & 0xffff)
#define MAX_PACKET_SHIFT (16)