diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-22 14:12:32 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-22 14:12:32 -0500 |
| commit | dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch) | |
| tree | 1c63e7c2f879cd322ca785671b74b4ff796dd24c /drivers/usb/wusbcore | |
| parent | a5e6ced58d423cb09c4fc0087dcfdb0b5deb5e1c (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/usb/wusbcore')
| -rw-r--r-- | drivers/usb/wusbcore/rh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c index 407a9fcc89cc..9fe4246cecb9 100644 --- a/drivers/usb/wusbcore/rh.c +++ b/drivers/usb/wusbcore/rh.c | |||
| @@ -329,7 +329,7 @@ static int wusbhc_rh_clear_port_feat(struct wusbhc *wusbhc, u16 feature, | |||
| 329 | static int wusbhc_rh_get_port_status(struct wusbhc *wusbhc, u16 port_idx, | 329 | static int wusbhc_rh_get_port_status(struct wusbhc *wusbhc, u16 port_idx, |
| 330 | u32 *_buf, u16 wLength) | 330 | u32 *_buf, u16 wLength) |
| 331 | { | 331 | { |
| 332 | u16 *buf = (u16 *) _buf; | 332 | __le16 *buf = (__le16 *)_buf; |
| 333 | 333 | ||
| 334 | if (port_idx > wusbhc->ports_max) | 334 | if (port_idx > wusbhc->ports_max) |
| 335 | return -EINVAL; | 335 | return -EINVAL; |