Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index a545d65f6e57..c302e1983c70 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -236,6 +236,9 @@ static void mon_text_event(struct mon_reader_text *rp, struct urb *urb,
                         fp++;
                         dp++;
                 }
+                /* Wasteful, but simple to understand: ISO 'C' is sparse. */
+                if (ev_type == 'C')
+                        ep->length = urb->transfer_buffer_length;
         }
 
         ep->setup_flag = mon_text_get_setup(ep, urb, ev_type, rp->r.m_bus);