diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/usb/core/endpoint.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/usb/core/endpoint.c')
| -rw-r--r-- | drivers/usb/core/endpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index df502a98d0df..db7fe50c23d4 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
| @@ -56,7 +56,7 @@ static ssize_t show_ep_wMaxPacketSize(struct device *dev, | |||
| 56 | { | 56 | { |
| 57 | struct ep_device *ep = to_ep_device(dev); | 57 | struct ep_device *ep = to_ep_device(dev); |
| 58 | return sprintf(buf, "%04x\n", | 58 | return sprintf(buf, "%04x\n", |
| 59 | le16_to_cpu(ep->desc->wMaxPacketSize) & 0x07ff); | 59 | usb_endpoint_maxp(ep->desc) & 0x07ff); |
| 60 | } | 60 | } |
| 61 | static DEVICE_ATTR(wMaxPacketSize, S_IRUGO, show_ep_wMaxPacketSize, NULL); | 61 | static DEVICE_ATTR(wMaxPacketSize, S_IRUGO, show_ep_wMaxPacketSize, NULL); |
| 62 | 62 | ||