Merge branch 'devel-stable' into devel

Conflicts:
	MAINTAINERS
	arch/arm/mm/fault.c

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 9d1babc7ff65..74f7f83b29ad 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1619,11 +1619,14 @@ itd_complete (
                                 desc->status = -EPROTO;
 
                         /* HC need not update length with this error */
-                        if (!(t & EHCI_ISOC_BABBLE))
-                                desc->actual_length = EHCI_ITD_LENGTH (t);
+                        if (!(t & EHCI_ISOC_BABBLE)) {
+                                desc->actual_length = EHCI_ITD_LENGTH(t);
+                                urb->actual_length += desc->actual_length;
+                        }
                 } else if (likely ((t & EHCI_ISOC_ACTIVE) == 0)) {
                         desc->status = 0;
-                        desc->actual_length = EHCI_ITD_LENGTH (t);
+                        desc->actual_length = EHCI_ITD_LENGTH(t);
+                        urb->actual_length += desc->actual_length;
                 } else {
                         /* URB was too late */
                         desc->status = -EXDEV;
@@ -2014,7 +2017,8 @@ sitd_complete (
                         desc->status = -EPROTO;
         } else {
                 desc->status = 0;
-                desc->actual_length = desc->length - SITD_LENGTH (t);
+                desc->actual_length = desc->length - SITD_LENGTH(t);
+                urb->actual_length += desc->actual_length;
         }
         stream->depth -= stream->interval << 3;