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

Commit cdd5a8fd authored Aug 14, 2007 by Pete Zaitcev Committed by Greg Kroah-Hartman Oct 12, 2007

usbmon: Drop DMA mapping for setup packet

Setup packet must be visible in virtual space. There's absolutely no
good reason to implement any kind of zero-copy transfer of 8 bytes, and
the documentation in usb.h is explicit about it. So, drop DMA remapping.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent 30c7431d

drivers/usb/mon/mon_bin.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -361,10 +361,6 @@ static inline char mon_bin_get_setup(unsigned char *setupb,
		if (!usb_endpoint_xfer_control(&urb->ep->desc) \|\| ev_type != 'S')
		return '-';

		if (urb->dev->bus->uses_dma &&
		(urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) {
		return mon_dmapeek(setupb, urb->setup_dma, SETUP_LEN);
		}
		if (urb->setup_packet == NULL)
		return 'Z';

drivers/usb/mon/mon_text.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -127,10 +127,6 @@ static inline char mon_text_get_setup(struct mon_event_text *ep,
		if (ep->xfertype != USB_ENDPOINT_XFER_CONTROL \|\| ev_type != 'S')
		return '-';

		if (urb->dev->bus->uses_dma &&
		(urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) {
		return mon_dmapeek(ep->setup, urb->setup_dma, SETUP_MAX);
		}
		if (urb->setup_packet == NULL)
		return 'Z'; /* '0' would be not as pretty. */