vserver 1.9.3

[linux-2.6.git] / drivers / usb / host / uhci-hub.c

diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index 5ab18db..22bbd70 100644 (file)
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -36,7 +36,7 @@ static __u8 root_hub_hub_des[] =
 static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf)
 {
        struct uhci_hcd *uhci = hcd_to_uhci(hcd);
-       unsigned int io_addr = uhci->io_addr;
+       unsigned long io_addr = uhci->io_addr;
        int i;
 
        *buf = 0;
@@ -69,7 +69,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 {
        struct uhci_hcd *uhci = hcd_to_uhci(hcd);
        int status, retval = 0, len = 0;
-       unsigned int port_addr = uhci->io_addr + USBPORTSC1 + 2 * (wIndex-1);
+       unsigned long port_addr = uhci->io_addr + USBPORTSC1 + 2 * (wIndex-1);
        __u16 wPortChange, wPortStatus;
 
        switch (typeReq) {
@@ -82,7 +82,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                */
 
        case GetHubStatus:
-               *(__u32 *)buf = cpu_to_le32(0);
+               *(__le32 *)buf = cpu_to_le32(0);
                OK(4);          /* hub power */
        case GetPortStatus:
                if (!wIndex || wIndex > uhci->rh_numports)
@@ -126,8 +126,8 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        dev_dbg(uhci_dev(uhci), "port %d portsc %04x\n",
                                        wIndex, status);
 
-               *(__u16 *)buf = cpu_to_le16(wPortStatus);
-               *(__u16 *)(buf + 2) = cpu_to_le16(wPortChange);
+               *(__le16 *)buf = cpu_to_le16(wPortStatus);
+               *(__le16 *)(buf + 2) = cpu_to_le16(wPortChange);
                OK(4);
        case SetHubFeature:             /* We don't implement these */
        case ClearHubFeature: