From 6f301b179899117a14f431423ffd1044dba0faa6 Mon Sep 17 00:00:00 2001 From: Pete Zaitcev Date: Tue, 14 Aug 2007 00:37:51 -0700 Subject: [PATCH] --- yaml --- r: 67844 b: refs/heads/master c: cdd5a8fd24f5be43417a25c6feb8e7ebdce63098 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/mon/mon_bin.c | 4 ---- trunk/drivers/usb/mon/mon_text.c | 4 ---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6d2afc7bbe25..4caf9f3be884 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30c7431de3631d6a5482a87b7c2453b937e8aa51 +refs/heads/master: cdd5a8fd24f5be43417a25c6feb8e7ebdce63098 diff --git a/trunk/drivers/usb/mon/mon_bin.c b/trunk/drivers/usb/mon/mon_bin.c index 5185e93dedef..3d6f03819ffd 100644 --- a/trunk/drivers/usb/mon/mon_bin.c +++ b/trunk/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/trunk/drivers/usb/mon/mon_text.c b/trunk/drivers/usb/mon/mon_text.c index a74069c2e82b..663a702a17dd 100644 --- a/trunk/drivers/usb/mon/mon_text.c +++ b/trunk/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. */