aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-01-18 17:33:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-25 08:01:12 -0500
commitf3c4140dc9c7a1719eba3537eee576050174f93c (patch)
treeba5068cae322aaf5d84ed3454eebdf2642d943c7
parent4fbdb33678829d39501e1ff950940d9090d4730a (diff)
isp116x-hcd: use HUB_CHAR_*
Fix using the bare number to set the 'wHubCharacteristics' field of the Hub Descriptor while the values are #define'd in <linux/usb/ch11.h>. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/isp116x-hcd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 31c9c4d0fa0b..113d0cc6cc43 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -948,7 +948,10 @@ static void isp116x_hub_descriptor(struct isp116x *isp116x,
948 desc->bHubContrCurrent = 0; 948 desc->bHubContrCurrent = 0;
949 desc->bNbrPorts = (u8) (reg & 0x3); 949 desc->bNbrPorts = (u8) (reg & 0x3);
950 /* Power switching, device type, overcurrent. */ 950 /* Power switching, device type, overcurrent. */
951 desc->wHubCharacteristics = cpu_to_le16((u16) ((reg >> 8) & 0x1f)); 951 desc->wHubCharacteristics = cpu_to_le16((u16) ((reg >> 8) &
952 (HUB_CHAR_LPSM |
953 HUB_CHAR_COMPOUND |
954 HUB_CHAR_OCPM)));
952 desc->bPwrOn2PwrGood = (u8) ((reg >> 24) & 0xff); 955 desc->bPwrOn2PwrGood = (u8) ((reg >> 24) & 0xff);
953 /* ports removable, and legacy PortPwrCtrlMask */ 956 /* ports removable, and legacy PortPwrCtrlMask */
954 desc->u.hs.DeviceRemovable[0] = 0; 957 desc->u.hs.DeviceRemovable[0] = 0;