aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 16:21:11 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 16:21:11 -0700
commit311a2460782236159ac73e9610096912fefb0f5e (patch)
treeacb9f79c8e8dff22bf9457c3ced512b0e0589177
parenteaaaa915fb5d26d4fbd71f1a9c9a5b9f07e6fef7 (diff)
downloadpatches-311a2460782236159ac73e9610096912fefb0f5e.tar.gz
fix up
-rw-r--r--series3
-rw-r--r--usb/usb-usbtest-ensure-correct-isoc-data-length.patch2
2 files changed, 3 insertions, 2 deletions
diff --git a/series b/series
index 6c449cb138d3e2..66d8e67342f7df 100644
--- a/series
+++ b/series
@@ -94,7 +94,7 @@ tty/tty-icount-changeover-for-other-main-devices.patch
tty/tty-fix-warning-left-over-from-tiocgicount-changes.patch
tty/tty-add-a-new-file-proc-tty-consoles.patch
tty/vcs-add-poll-fasync-support.patch
-tty/vcs-invoke-the-vt-update-callback-when-dev-vcs-is-written-to.patchusb-usbtest-fix-coding-style.patch
+tty/vcs-invoke-the-vt-update-callback-when-dev-vcs-is-written-to.patch
###################################
# USB stuff for after 2.6.36 is out
@@ -189,6 +189,7 @@ usb/usb-uhci-add-native-scatter-gather-support-v1.patch
usb/usb-langwell_udc-fix-big-file-transfer-issue.patch
usb/usb-langwell_udc-cancel-pending-requests-when-controller-is-suspended.patch
usb/usb-disable-endpoints-after-unbinding-interfaces-not-before.patch
+usb/usb-usbtest-fix-coding-style.patch
usb/usb-usbtest-ensure-correct-isoc-data-length.patch
usb/usb-imx21-hcd-remove-unused-variable.patch
usb/usb-imx21-hcd-refactor-hardware-data-memory-management.patch
diff --git a/usb/usb-usbtest-ensure-correct-isoc-data-length.patch b/usb/usb-usbtest-ensure-correct-isoc-data-length.patch
index 7560657f9baa80..ae39b2cff2a076 100644
--- a/usb/usb-usbtest-ensure-correct-isoc-data-length.patch
+++ b/usb/usb-usbtest-ensure-correct-isoc-data-length.patch
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
-@@ -1363,6 +1363,8 @@ static void iso_callback (struct urb *ur
+@@ -1371,6 +1371,8 @@ static void iso_callback(struct urb *urb
ctx->errors += urb->error_count;
else if (urb->status != 0)
ctx->errors += urb->number_of_packets;