From 126da4c95eeb681880ed7a86c9f5c627bf6c7e2a Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Tue, 13 Sep 2011 16:41:12 -0700 Subject: [PATCH] --- yaml --- r: 265007 b: refs/heads/master c: 170c026347c867a71e27713b98c58b266146c468 h: refs/heads/master i: 265005: b1104054cec8445baad2b682662af971cbef5423 265003: f3dcdc06039ddb5c0e26244c93a43cde0795d704 264999: f1c04720da1f58c0a6164730fe7240d8b46c9716 264991: 125b33192537575136e07c012a5b124011485f1f v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-mem.c | 9 +++++---- trunk/drivers/usb/host/xhci.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a94e2dfd71c0..b9b1a92cf254 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75d7cf72ab9fa01dc70877aa5c68e8ef477229dc +refs/heads/master: 170c026347c867a71e27713b98c58b266146c468 diff --git a/trunk/drivers/usb/host/xhci-mem.c b/trunk/drivers/usb/host/xhci-mem.c index c4b8959e01e7..94a8b28d602e 100644 --- a/trunk/drivers/usb/host/xhci-mem.c +++ b/trunk/drivers/usb/host/xhci-mem.c @@ -1473,11 +1473,12 @@ void xhci_update_bw_info(struct xhci_hcd *xhci, /* Added or changed endpoint */ bw_info->ep_interval = CTX_TO_EP_INTERVAL( le32_to_cpu(ep_ctx->ep_info)); - bw_info->mult = CTX_TO_EP_MULT( - le32_to_cpu(ep_ctx->ep_info)); - /* Number of packets is zero-based in the input context, - * but we want one-based for the interval table. + /* Number of packets and mult are zero-based in the + * input context, but we want one-based for the + * interval table. */ + bw_info->mult = CTX_TO_EP_MULT( + le32_to_cpu(ep_ctx->ep_info)) + 1; bw_info->num_packets = CTX_TO_MAX_BURST( le32_to_cpu(ep_ctx->ep_info2)) + 1; bw_info->max_packet_size = MAX_PACKET_DECODED( diff --git a/trunk/drivers/usb/host/xhci.h b/trunk/drivers/usb/host/xhci.h index 13f1c23ed19d..752a500f8695 100644 --- a/trunk/drivers/usb/host/xhci.h +++ b/trunk/drivers/usb/host/xhci.h @@ -747,8 +747,9 @@ struct xhci_stream_info { * (DMI) also limits the total bandwidth (across all domains) that can be used. */ struct xhci_bw_info { + /* ep_interval is zero-based */ unsigned int ep_interval; - /* mult and num_packets are zero-based */ + /* mult and num_packets are one-based */ unsigned int mult; unsigned int num_packets; unsigned int max_packet_size;