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>

diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index 5185e93dedef80379e43c7ad404cc696bac45d9a..3d6f03819ffd9308d6aa992a0b7ca9a24fadbaac 100644 (file)
--- 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,
        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';
 

diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index a74069c2e82bb727c71b4dceced47164abaf99f6..663a702a17dd8e39d37ef7e4d4e14acc999bbf68 100644 (file)
--- 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,
        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. */