diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2006-08-30 11:35:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:56 -0400 |
commit | 4d6cd48380c4d361cc8ec34359df22377d85d202 (patch) | |
tree | 21f052fc743818d0c14c85505293f96b9274a94c /drivers/usb/mon/mon_main.c | |
parent | 1720058343fa43a1a25bfad9e62ea06e7e9743b6 (diff) |
usbmon: don't call mon_dmapeek if DMA isn't being used
This patch (as755b) fixes a bug in usbmon. Rather than assuming all
USB host controllers use DMA, the code will check the usb_bus data
structure. If DMA isn't used, we don't want to try peeking into a
non-existent DMA buffer!
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/mon/mon_main.c')
-rw-r--r-- | drivers/usb/mon/mon_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c index e0ed36cdfd8b..394bbf2f68d4 100644 --- a/drivers/usb/mon/mon_main.c +++ b/drivers/usb/mon/mon_main.c | |||
@@ -301,6 +301,7 @@ static void mon_bus_init(struct dentry *mondir, struct usb_bus *ubus) | |||
301 | */ | 301 | */ |
302 | mbus->u_bus = ubus; | 302 | mbus->u_bus = ubus; |
303 | ubus->mon_bus = mbus; | 303 | ubus->mon_bus = mbus; |
304 | mbus->uses_dma = ubus->uses_dma; | ||
304 | 305 | ||
305 | rc = snprintf(name, NAMESZ, "%dt", ubus->busnum); | 306 | rc = snprintf(name, NAMESZ, "%dt", ubus->busnum); |
306 | if (rc <= 0 || rc >= NAMESZ) | 307 | if (rc <= 0 || rc >= NAMESZ) |