Listening to your wishes I have the following:
patch1 removing useless warning:
diff -r -u /home/brm/kernel/linux-2.6.11-rc3.orig/drivers/usb/core/devio.c drivers/usb/core/devio.c
--- /home/brm/kernel/linux-2.6.11-rc3.orig/drivers/usb/core/devio.c 2005-02-05 10:41:56.000000000 +0100
+++ drivers/usb/core/devio.c 2005-02-09 22:33:47.000000000 +0100
@@ -660,11 +660,8 @@
usb_lock_device(dev);
}
kfree(tbuf);
- if (i < 0) {
- dev_warn(&dev->dev, "usbfs: USBDEVFS_BULK failed "
- "ep 0x%x len %u ret %d\n", bulk.ep, bulk.len, i);
+ if (i < 0)
return i;
- }
return len2;
}
patch 2 making a warning a debug message, returning a non-error when there is data in an urb even when it has timed out:
diff -r -u /home/brm/kernel/linux-2.6.11-rc3.orig/drivers/usb/core/message.c drivers/usb/core/message.c
--- /home/brm/kernel/linux-2.6.11-rc3.orig/drivers/usb/core/message.c 2005-02-05 10:41:57.000000000 +0100
+++ drivers/usb/core/message.c 2005-02-09 22:37:35.000000000 +0100
@@ -65,12 +65,18 @@
status = urb->status;
/* note: HCDs return ETIMEDOUT for other reasons too */
if (status == -ECONNRESET) {
- dev_warn(&urb->dev->dev,
- "%s timed out on ep%d%s\n",
+ dev_dbg(&urb->dev->dev,
+ "%s timed out on ep%d%s len=%d/%d\n",
current->comm,
usb_pipeendpoint(urb->pipe),
- usb_pipein(urb->pipe) ? "in" : "out");
- status = -ETIMEDOUT;
+ usb_pipein(urb->pipe) ? "in" : "out",
+ urb->actual_length,
+ urb->transfer_buffer_length
+ );
+ if (urb->actual_length > 0)
+ status = 0;
+ else
+ status = -ETIMEDOUT;
}
if (timeout > 0)
del_timer_sync(&timer);
Presumably you think this should be 2 seperate patches (although this was not entirely clear) part 1 fixing the bug and part 2 fixing the message?
/Brian
------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ [email protected] To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
