Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky...

[~andy/linux] / drivers / usb / core / urb.c

diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index a760e46871c5b66fc0f40055df5d1ace8e0b9ec1..7c0555548ac862b9606600c38f9b48a94e144f57 100644 (file)
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -308,8 +308,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
         * will be required to set urb->ep directly and we will eliminate
         * urb->pipe.
         */
-       ep = (usb_pipein(urb->pipe) ? dev->ep_in : dev->ep_out)
-                       [usb_pipeendpoint(urb->pipe)];
+       ep = usb_pipe_endpoint(dev, urb->pipe);
        if (!ep)
                return -ENOENT;