1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 25fb1da8d3d7..4f4ba1ea9e9b 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1103,12 +1103,12 @@ sl811h_hub_descriptor (
                 desc->bPwrOn2PwrGood = sl811->board->potpg;
                 if (!desc->bPwrOn2PwrGood)
                         desc->bPwrOn2PwrGood = 10;
-                temp = 0x0001;
+                temp = HUB_CHAR_INDV_PORT_LPSM;
         } else
-                temp = 0x0002;
+                temp = HUB_CHAR_NO_LPSM;
 
         /* no overcurrent errors detection/handling */
-        temp |= 0x0010;
+        temp |= HUB_CHAR_NO_OCPM;
 
         desc->wHubCharacteristics = cpu_to_le16(temp);
 
@@ -1691,9 +1691,7 @@ sl811h_probe(struct platform_device *dev)
         spin_lock_init(&sl811->lock);
         INIT_LIST_HEAD(&sl811->async);
         sl811->board = dev_get_platdata(&dev->dev);
-        init_timer(&sl811->timer);
-        sl811->timer.function = sl811h_timer;
-        sl811->timer.data = (unsigned long) sl811;
+        setup_timer(&sl811->timer, sl811h_timer, (unsigned long)sl811);
         sl811->addr_reg = addr_reg;
         sl811->data_reg = data_reg;