---

yaml
---
r: 15487
b: refs/heads/master
c: b9b0942
h: refs/heads/master
i:
  15485: 247e3f7
  15483: 6dd1863
  15479: 9054595
  15471: 31fe474
  15455: d6e90a0
  15423: e39b29f
  15359: dfd735e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 687f5f3428157bea4940dd967fd7b4e59c1b13b4
+refs/heads/master: b9b09422570e5e35a9f590a1ead63e711aefac8c

trunk/drivers/usb/mon/mon_text.c

@@ -97,19 +97,12 @@ static inline char mon_text_get_data(struct mon_event_text *ep, struct urb *urb,
 	if (len >= DATA_MAX)
 		len = DATA_MAX;
 
-	/*
-	 * Bulk is easy to shortcut reliably. 
-	 * XXX Other pipe types need consideration. Currently, we overdo it
-	 * and collect garbage for them: better more than less.
-	 */
-	if (usb_pipebulk(pipe) || usb_pipecontrol(pipe)) {
-		if (usb_pipein(pipe)) {
-			if (ev_type == 'S')
-				return '<';
-		} else {
-			if (ev_type == 'C')
-				return '>';
-		}
+	if (usb_pipein(pipe)) {
+		if (ev_type == 'S')
+			return '<';
+	} else {
+		if (ev_type == 'C')
+			return '>';
 	}
 
 	/*