Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict

[firefly-linux-kernel-4.4.55.git] / include / linux / usb / ch9.h

diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 61b29057b0547cbe42e050d1debab583d8fd38e1..3b6f628880f83b0f05b3c3363a7202665a5ce9ca 100644 (file)
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -589,7 +589,7 @@ static inline int usb_endpoint_is_isoc_out(
  */
 static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
 {
-       return le16_to_cpu(epd->wMaxPacketSize);
+       return __le16_to_cpu(epd->wMaxPacketSize);
 }
 
 /*-------------------------------------------------------------------------*/