diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:16:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:16:52 -0400 |
| commit | 70d002bccac5e107fafb95e83fcb7fc010a88695 (patch) | |
| tree | 58607b980731b3ac418693a1d511630f482564c1 /drivers/usb/host/ohci-hub.c | |
| parent | 7f0852f959d8e92786c684ebd7fee3332a2f4efe (diff) | |
| parent | a969888ce91673c7f4b86520d851a6f0d5a5fa7d (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 of HEAD
* HEAD: (44 commits)
[PATCH] USB: move usb-serial.h to include/linux/usb/
[PATCH] USB: Anydata: Fixes wrong URB callback.
[PATCH] USB: gadget section fixups
[PATCH] USB: another unusual device
[PATCH] USB: Add one VID/PID to ftdi_sio
[PATCH] USB: unusual_devs entry for Sony DSC-H5
[PATCH] USB: unusual_devs entry for Nokia E61
[PATCH] USB: unusual_devs entry for Nokia N91
[PATCH] USB: add ZyXEL vendor/product ID to rtl8150 driver
[PATCH] USB: Option driver: new product ID
[PATCH] USB: add support for WiseGroup., Ltd SmartJoy Dual PLUS Adapter
[PATCH] USB: ipw.c driver fix
[PATCH] USB: remove devfs information from Kconfig
[PATCH] USB: remove empty destructor from drivers/usb/mon/mon_text.c
[PATCH] USB: ipaq.c timing parameters
[PATCH] USB: ipaq.c bugfixes
[PATCH] USB: ehci: fix bogus alteration of a local variable
[PATCH] USB: add driver for non-composite Sierra Wireless devices
[PATCH] USB: fix pointer dereference in drivers/usb/misc/usblcd
[PATCH] USB: Kill compiler warning in quirk_usb_handoff_ohci
...
Diffstat (limited to 'drivers/usb/host/ohci-hub.c')
| -rw-r--r-- | drivers/usb/host/ohci-hub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index 0bb972b58336..5b0a23fd798b 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c | |||
| @@ -581,14 +581,14 @@ static int ohci_hub_control ( | |||
| 581 | break; | 581 | break; |
| 582 | case GetHubStatus: | 582 | case GetHubStatus: |
| 583 | temp = roothub_status (ohci) & ~(RH_HS_CRWE | RH_HS_DRWE); | 583 | temp = roothub_status (ohci) & ~(RH_HS_CRWE | RH_HS_DRWE); |
| 584 | *(__le32 *) buf = cpu_to_le32 (temp); | 584 | put_unaligned(cpu_to_le32 (temp), (__le32 *) buf); |
| 585 | break; | 585 | break; |
| 586 | case GetPortStatus: | 586 | case GetPortStatus: |
| 587 | if (!wIndex || wIndex > ports) | 587 | if (!wIndex || wIndex > ports) |
| 588 | goto error; | 588 | goto error; |
| 589 | wIndex--; | 589 | wIndex--; |
| 590 | temp = roothub_portstatus (ohci, wIndex); | 590 | temp = roothub_portstatus (ohci, wIndex); |
| 591 | *(__le32 *) buf = cpu_to_le32 (temp); | 591 | put_unaligned(cpu_to_le32 (temp), (__le32 *) buf); |
| 592 | 592 | ||
| 593 | #ifndef OHCI_VERBOSE_DEBUG | 593 | #ifndef OHCI_VERBOSE_DEBUG |
| 594 | if (*(u16*)(buf+2)) /* only if wPortChange is interesting */ | 594 | if (*(u16*)(buf+2)) /* only if wPortChange is interesting */ |