aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/mon
diff options
context:
space:
mode:
authorPete Zaitcev <zaitcev@redhat.com>2007-08-14 03:37:51 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:55:14 -0400
commitcdd5a8fd24f5be43417a25c6feb8e7ebdce63098 (patch)
treeb17ebeb11b08674a495105946ebdb80d5cb15c24 /drivers/usb/mon
parent30c7431de3631d6a5482a87b7c2453b937e8aa51 (diff)
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>
Diffstat (limited to 'drivers/usb/mon')
-rw-r--r--drivers/usb/mon/mon_bin.c4
-rw-r--r--drivers/usb/mon/mon_text.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 5185e93dedef..3d6f03819ffd 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -361,10 +361,6 @@ static inline char mon_bin_get_setup(unsigned char *setupb,
361 if (!usb_endpoint_xfer_control(&urb->ep->desc) || ev_type != 'S') 361 if (!usb_endpoint_xfer_control(&urb->ep->desc) || ev_type != 'S')
362 return '-'; 362 return '-';
363 363
364 if (urb->dev->bus->uses_dma &&
365 (urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) {
366 return mon_dmapeek(setupb, urb->setup_dma, SETUP_LEN);
367 }
368 if (urb->setup_packet == NULL) 364 if (urb->setup_packet == NULL)
369 return 'Z'; 365 return 'Z';
370 366
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index a74069c2e82b..663a702a17dd 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -127,10 +127,6 @@ static inline char mon_text_get_setup(struct mon_event_text *ep,
127 if (ep->xfertype != USB_ENDPOINT_XFER_CONTROL || ev_type != 'S') 127 if (ep->xfertype != USB_ENDPOINT_XFER_CONTROL || ev_type != 'S')
128 return '-'; 128 return '-';
129 129
130 if (urb->dev->bus->uses_dma &&
131 (urb->transfer_flags & URB_NO_SETUP_DMA_MAP)) {
132 return mon_dmapeek(ep->setup, urb->setup_dma, SETUP_MAX);
133 }
134 if (urb->setup_packet == NULL) 130 if (urb->setup_packet == NULL)
135 return 'Z'; /* '0' would be not as pretty. */ 131 return 'Z'; /* '0' would be not as pretty. */
136 132