vserver 1.9.5.x5

[linux-2.6.git] / drivers / usb / core / urb.c

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 3c14361..dc838f8 100644 (file)
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -264,11 +264,10 @@ int usb_submit_urb(struct urb *urb, int mem_flags)
 
        max = usb_maxpacket (dev, pipe, is_out);
        if (max <= 0) {
-               dbg ("%s: bogus endpoint %d-%s on usb-%s-%s (bad maxpacket %d)",
-                       __FUNCTION__,
-                       usb_pipeendpoint (pipe), is_out ? "OUT" : "IN",
-                       dev->bus->bus_name, dev->devpath,
-                       max);
+               dev_dbg(&dev->dev,
+                       "bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
+                       usb_pipeendpoint (pipe), is_out ? "out" : "in",
+                       __FUNCTION__, max);
                return -EMSGSIZE;
        }
 
@@ -451,6 +450,13 @@ int usb_unlink_urb(struct urb *urb)
        if (!urb)
                return -EINVAL;
        if (!(urb->transfer_flags & URB_ASYNC_UNLINK)) {
+#ifdef CONFIG_DEBUG_KERNEL
+               if (printk_ratelimit()) {
+                       printk(KERN_NOTICE "usb_unlink_urb() is deprecated for "
+                               "synchronous unlinks.  Use usb_kill_urb() instead.\n");
+                       WARN_ON(1);
+               }
+#endif
                usb_kill_urb(urb);
                return 0;
        }