3 files changed, 10 insertions, 4 deletions

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 79d1cdf4a635..d8329eb47d4f 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -226,8 +226,7 @@ int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
         struct urb *urb;
         struct usb_host_endpoint *ep;
 
-        ep = (usb_pipein(pipe) ? usb_dev->ep_in : usb_dev->ep_out)
-                        [usb_pipeendpoint(pipe)];
+        ep = usb_pipe_endpoint(usb_dev, pipe);
         if (!ep || len < 0)
                 return -EINVAL;
 
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index a760e46871c5..7c0555548ac8 100644
--- 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;
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 1eb4762d9ea8..fd7d61e58198 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1552,6 +1552,14 @@ static inline unsigned int __create_pipe(struct usb_device *dev,
 #define usb_rcvintpipe(dev,endpoint)    \
         ((PIPE_INTERRUPT << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN)
 
+static inline struct usb_host_endpoint *
+usb_pipe_endpoint(struct usb_device *dev, unsigned int pipe)
+{
+        struct usb_host_endpoint **eps;
+        eps = usb_pipein(pipe) ? dev->ep_in : dev->ep_out;
+        return eps[usb_pipeendpoint(pipe)];
+}
+
 /*-------------------------------------------------------------------------*/
 
 static inline __u16