--- zzzz-none-000/linux-2.6.32.60/drivers/usb/core/hcd.c	2012-10-07 21:41:24.000000000 +0000
+++ ur8-7270-606/linux-2.6.32.60/drivers/usb/core/hcd.c	2011-09-08 14:02:07.000000000 +0000
@@ -1375,6 +1375,9 @@
 	atomic_inc(&urb->use_count);
 	atomic_inc(&urb->dev->urbnum);
 	usbmon_urb_submit(&hcd->self, urb);
+#ifdef AVM_USB_TRACE
+	avm_usb_trace_submit(hcd, urb);
+#endif	
 
 	/* NOTE requirements on root-hub callers (usbfs and the hub
 	 * driver, for now):  URBs' urb->transfer_buffer must be
@@ -1386,6 +1389,9 @@
 	status = map_urb_for_dma(hcd, urb, mem_flags);
 	if (unlikely(status)) {
 		usbmon_urb_submit_error(&hcd->self, urb, status);
+#ifdef AVM_USB_TRACE
+		avm_usb_trace_error(hcd, urb, status);
+#endif	
 		goto error;
 	}
 
@@ -1396,6 +1402,9 @@
 
 	if (unlikely(status)) {
 		usbmon_urb_submit_error(&hcd->self, urb, status);
+#ifdef AVM_USB_TRACE
+		avm_usb_trace_error(hcd, urb, status);
+#endif	
 		unmap_urb_for_dma(hcd, urb);
  error:
 		urb->hcpriv = NULL;
@@ -1500,6 +1509,10 @@
 
 	unmap_urb_for_dma(hcd, urb);
 	usbmon_urb_complete(&hcd->self, urb, status);
+#ifdef AVM_USB_TRACE
+	avm_usb_trace_complete(hcd, urb, status);
+#endif	
+	
 	usb_unanchor_urb(urb);
 
 	/* pass ownership to the completion handler */
@@ -2137,6 +2150,11 @@
 	}
 	if (hcd->uses_new_polling && hcd->poll_rh)
 		usb_hcd_poll_rh_status(hcd);
+
+#ifdef AVM_USB_TRACE
+	avm_usb_register_trace_device (hcd);
+#endif	
+	
 	return retval;
 
 error_create_attr_group:
@@ -2197,6 +2215,11 @@
 
 	if (hcd->irq >= 0)
 		free_irq(hcd->irq, hcd);
+
+#ifdef AVM_USB_TRACE
+	avm_usb_deregister_trace_device (hcd);
+#endif
+
 	usb_deregister_bus(&hcd->self);
 	hcd_buffer_destroy(hcd);
 }