aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/udc
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-01-18 17:55:55 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-25 08:02:32 -0500
commit2345f84c6ac65ef546978c1b1f741526f9cbd342 (patch)
treee1ddd7adf18043fd26916b742a8547ed2e06a391 /drivers/usb/gadget/udc
parent265bf230ab583c45344f93a061046509d5a4ab71 (diff)
dummy_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>. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/udc')
-rw-r--r--drivers/usb/gadget/udc/dummy_hcd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 9c598801404c..270c1ec650fa 100644
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -1924,7 +1924,9 @@ ss_hub_descriptor(struct usb_hub_descriptor *desc)
1924 memset(desc, 0, sizeof *desc); 1924 memset(desc, 0, sizeof *desc);
1925 desc->bDescriptorType = 0x2a; 1925 desc->bDescriptorType = 0x2a;
1926 desc->bDescLength = 12; 1926 desc->bDescLength = 12;
1927 desc->wHubCharacteristics = cpu_to_le16(0x0001); 1927 desc->wHubCharacteristics = cpu_to_le16(
1928 HUB_CHAR_INDV_PORT_LPSM |
1929 HUB_CHAR_COMMON_OCPM);
1928 desc->bNbrPorts = 1; 1930 desc->bNbrPorts = 1;
1929 desc->u.ss.bHubHdrDecLat = 0x04; /* Worst case: 0.4 micro sec*/ 1931 desc->u.ss.bHubHdrDecLat = 0x04; /* Worst case: 0.4 micro sec*/
1930 desc->u.ss.DeviceRemovable = 0xffff; 1932 desc->u.ss.DeviceRemovable = 0xffff;
@@ -1935,7 +1937,9 @@ static inline void hub_descriptor(struct usb_hub_descriptor *desc)
1935 memset(desc, 0, sizeof *desc); 1937 memset(desc, 0, sizeof *desc);
1936 desc->bDescriptorType = 0x29; 1938 desc->bDescriptorType = 0x29;
1937 desc->bDescLength = 9; 1939 desc->bDescLength = 9;
1938 desc->wHubCharacteristics = cpu_to_le16(0x0001); 1940 desc->wHubCharacteristics = cpu_to_le16(
1941 HUB_CHAR_INDV_PORT_LPSM |
1942 HUB_CHAR_COMMON_OCPM);
1939 desc->bNbrPorts = 1; 1943 desc->bNbrPorts = 1;
1940 desc->u.hs.DeviceRemovable[0] = 0xff; 1944 desc->u.hs.DeviceRemovable[0] = 0xff;
1941 desc->u.hs.DeviceRemovable[1] = 0xff; 1945 desc->u.hs.DeviceRemovable[1] = 0xff;