Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b09422 authored by Pete Zaitcev's avatar Pete Zaitcev Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: Let usbmon collect less garbage 



Alan Stern pointed out that (in 2.6 kernel) one successful submission results
in one callback, even for ISO-out transfers. Thus, the silly check can be
removed from usbmon. This reduces the amount of garbage printed in case
of ISO and Interrupt transfers.

Signed-off-by: default avatarPete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 687f5f34

drivers/usb/mon/mon_text.c

+6 −13
Original line number Diff line number Diff line
@@ -97,12 +97,6 @@ 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 '<';
@@ -110,7 +104,6 @@ static inline char mon_text_get_data(struct mon_event_text *ep, struct urb *urb, 
		if (ev_type == 'C')

			return '>';

	}

	}



	/*

	 * The check to see if it's safe to poke at data has an enormous