isp1362-hcd: use HUB_CHAR_*

Fix  using the  bare numbers to set the 'wHubCharacteristics' field of the Hub
Descriptor while the values are #define'd in <linux/usb/ch11.h>.

While at it, avoid duplicate computation when calling DBG().

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 75e5876f9d7c310f5a73c2f6fd3ace55e9381694..b32ab60cad1ecd34946033afc1327972c8bbee84 100644 (file)
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -1543,8 +1543,12 @@ static void isp1362_hub_descriptor(struct isp1362_hcd *isp1362_hcd,
        desc->bHubContrCurrent = 0;
        desc->bNbrPorts = reg & 0x3;
        /* Power switching, device type, overcurrent. */
-       desc->wHubCharacteristics = cpu_to_le16((reg >> 8) & 0x1f);
-       DBG(0, "%s: hubcharacteristics = %02x\n", __func__, cpu_to_le16((reg >> 8) & 0x1f));
+       desc->wHubCharacteristics = cpu_to_le16((reg >> 8) &
+                                               (HUB_CHAR_LPSM |
+                                                HUB_CHAR_COMPOUND |
+                                                HUB_CHAR_OCPM));
+       DBG(0, "%s: hubcharacteristics = %02x\n", __func__,
+                       desc->wHubCharacteristics);
        desc->bPwrOn2PwrGood = (reg >> 24) & 0xff;
        /* ports removable, and legacy PortPwrCtrlMask */
        desc->u.hs.DeviceRemovable[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;