aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-01-18 17:25:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-25 08:01:11 -0500
commit3a2359ee7d00d7746e4e71a15e06d06a5b376f58 (patch)
treeeb0050b47eeb724cbd8fdc48d8bd8f0606aeaf8b
parenta6134136d938ed9298f15e865e4a035f9c0eeb9c (diff)
ehci-hub: 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>. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/ehci-hub.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 118edb7bdca2..87cf86f38b36 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -700,15 +700,15 @@ ehci_hub_descriptor (
700 memset(&desc->u.hs.DeviceRemovable[0], 0, temp); 700 memset(&desc->u.hs.DeviceRemovable[0], 0, temp);
701 memset(&desc->u.hs.DeviceRemovable[temp], 0xff, temp); 701 memset(&desc->u.hs.DeviceRemovable[temp], 0xff, temp);
702 702
703 temp = 0x0008; /* per-port overcurrent reporting */ 703 temp = HUB_CHAR_INDV_PORT_OCPM; /* per-port overcurrent reporting */
704 if (HCS_PPC (ehci->hcs_params)) 704 if (HCS_PPC (ehci->hcs_params))
705 temp |= 0x0001; /* per-port power control */ 705 temp |= HUB_CHAR_INDV_PORT_LPSM; /* per-port power control */
706 else 706 else
707 temp |= 0x0002; /* no power switching */ 707 temp |= HUB_CHAR_NO_LPSM; /* no power switching */
708#if 0 708#if 0
709// re-enable when we support USB_PORT_FEAT_INDICATOR below. 709// re-enable when we support USB_PORT_FEAT_INDICATOR below.
710 if (HCS_INDICATOR (ehci->hcs_params)) 710 if (HCS_INDICATOR (ehci->hcs_params))
711 temp |= 0x0080; /* per-port indicators (LEDs) */ 711 temp |= HUB_CHAR_PORTIND; /* per-port indicators (LEDs) */
712#endif 712#endif
713 desc->wHubCharacteristics = cpu_to_le16(temp); 713 desc->wHubCharacteristics = cpu_to_le16(temp);
714} 714}