diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-05 10:59:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-05 10:59:25 -0800 |
| commit | f878c4f193b7327244af8f7de8cf8bc61fb78fe1 (patch) | |
| tree | 0d95465d5a6a8f13259bc149b249f29501e7fb75 /usb | |
| parent | 39874450fa07821078746db7b99cc931ca9478cc (diff) | |
| download | patches-f878c4f193b7327244af8f7de8cf8bc61fb78fe1.tar.gz | |
some bugfixes for .32
Diffstat (limited to 'usb')
3 files changed, 46 insertions, 2 deletions
diff --git a/usb/usb-xhci-add-watchdog-timer-for-urb-cancellation.patch b/usb/usb-xhci-add-watchdog-timer-for-urb-cancellation.patch index a3354eab535f1d..10199011b4b7c3 100644 --- a/usb/usb-xhci-add-watchdog-timer-for-urb-cancellation.patch +++ b/usb/usb-xhci-add-watchdog-timer-for-urb-cancellation.patch @@ -473,7 +473,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * When we get a completion for a Set Transfer Ring Dequeue Pointer command, * we need to clear the set deq pending flag in the endpoint ring state, so that -@@ -1330,6 +1472,14 @@ void xhci_handle_event(struct xhci_hcd * +@@ -1333,6 +1475,14 @@ void xhci_handle_event(struct xhci_hcd * default: xhci->error_bitmask |= 1 << 3; } diff --git a/usb/usb-xhci-handle-urb-cancel-complete-and-resubmit-race.patch b/usb/usb-xhci-handle-urb-cancel-complete-and-resubmit-race.patch index 4c6d92dea4ec30..831904f7226b38 100644 --- a/usb/usb-xhci-handle-urb-cancel-complete-and-resubmit-race.patch +++ b/usb/usb-xhci-handle-urb-cancel-complete-and-resubmit-race.patch @@ -128,7 +128,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* If necessary, queue a Set Transfer Ring Dequeue Pointer command */ if (deq_state.new_deq_ptr && deq_state.new_deq_seg) { -@@ -1246,10 +1249,9 @@ td_cleanup: +@@ -1249,10 +1252,9 @@ td_cleanup: } list_del(&td->td_list); /* Was this TD slated to be cancelled but completed anyway? */ diff --git a/usb/usb-xhci-remove-unused-hcd-statistics-code.patch b/usb/usb-xhci-remove-unused-hcd-statistics-code.patch new file mode 100644 index 00000000000000..1919cb9e506de1 --- /dev/null +++ b/usb/usb-xhci-remove-unused-hcd-statistics-code.patch @@ -0,0 +1,44 @@ +From sarah.a.sharp@linux.intel.com Thu Nov 5 10:17:19 2009 +From: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Date: Tue, 3 Nov 2009 13:06:40 -0800 +Subject: USB: xhci: Remove unused HCD statistics code. +To: Greg KH <gregkh@suse.de> +Cc: linux-usb@vger.kernel.org +Message-ID: <20091103210640.GA28392@xanatos> +Content-Disposition: inline + + +CONFIG_USB_HCD_STAT was used in an abandoned patch to track host +controller throughput statistics. Since CONFIG_USB_HCD_STAT will never be +defined, remove code that can never run. + +Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/xhci-ring.c | 7 ------- + 1 file changed, 7 deletions(-) + +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -526,9 +526,6 @@ static void handle_stopped_endpoint(stru + struct xhci_td *last_unlinked_td; + + struct xhci_dequeue_state deq_state; +-#ifdef CONFIG_USB_HCD_STAT +- ktime_t stop_time = ktime_get(); +-#endif + + memset(&deq_state, 0, sizeof(deq_state)); + slot_id = TRB_TO_SLOT_ID(trb->generic.field[3]); +@@ -593,10 +590,6 @@ static void handle_stopped_endpoint(stru + list_del(&cur_td->cancelled_td_list); + + /* Clean up the cancelled URB */ +-#ifdef CONFIG_USB_HCD_STAT +- hcd_stat_update(xhci->tp_stat, cur_td->urb->actual_length, +- ktime_sub(stop_time, cur_td->start_time)); +-#endif + /* Doesn't matter what we pass for status, since the core will + * just overwrite it (because the URB has been unlinked). + */ |