Merge remote-tracking branch 'dt-rh/for-next'

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

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 3d274778caaf8f9f473aacc89b1be6c20de19ab2..f33b6e02b9fd6cfb3c4c10b51ec8a504f5eba34f 100644 (file)
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -444,8 +444,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
         */
 
        /* Check that the pipe's type matches the endpoint's type */
-       if (usb_pipetype(urb->pipe) != pipetypes[xfertype])
-               dev_WARN(&dev->dev, "BOGUS urb xfer, pipe %x != type %x\n",
+       dev_WARN(&dev->dev, usb_pipetype(urb->pipe) != pipetypes[xfertype],
+                       "BOGUS urb xfer, pipe %x != type %x\n",
                        usb_pipetype(urb->pipe), pipetypes[xfertype]);
 
        /* Check against a simple/standard policy */
@@ -471,8 +471,8 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
        allowed &= urb->transfer_flags;
 
        /* warn if submitter gave bogus flags */
-       if (allowed != urb->transfer_flags)
-               dev_WARN(&dev->dev, "BOGUS urb flags, %x --> %x\n",
+       dev_WARN(&dev->dev, allowed != urb->transfer_flags,
+                       "BOGUS urb flags, %x --> %x\n",
                        urb->transfer_flags, allowed);
 
        /*