aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-01-18 17:49:59 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-25 08:01:13 -0500
commita7cf697d3adc062d75180001ba58f5368c11e4a3 (patch)
treeeddc6af642aea7a54de3a6dba8ba93deade45d2f
parentc25af1d67f67fb05b494351d31b7cf6d67174872 (diff)
u132-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>
-rw-r--r--drivers/usb/host/u132-hcd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 2894e54e5b9c..ad97e8a1ad1c 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -2590,15 +2590,15 @@ static int u132_roothub_descriptor(struct u132 *u132,
2590 desc->bNbrPorts = u132->num_ports; 2590 desc->bNbrPorts = u132->num_ports;
2591 temp = 1 + (u132->num_ports / 8); 2591 temp = 1 + (u132->num_ports / 8);
2592 desc->bDescLength = 7 + 2 * temp; 2592 desc->bDescLength = 7 + 2 * temp;
2593 temp = 0; 2593 temp = HUB_CHAR_COMMON_LPSM | HUB_CHAR_COMMON_OCPM;
2594 if (rh_a & RH_A_NPS) 2594 if (rh_a & RH_A_NPS)
2595 temp |= 0x0002; 2595 temp |= HUB_CHAR_NO_LPSM;
2596 if (rh_a & RH_A_PSM) 2596 if (rh_a & RH_A_PSM)
2597 temp |= 0x0001; 2597 temp |= HUB_CHAR_INDV_PORT_LPSM;
2598 if (rh_a & RH_A_NOCP) 2598 if (rh_a & RH_A_NOCP)
2599 temp |= 0x0010; 2599 temp |= HUB_CHAR_NO_OCPM;
2600 else if (rh_a & RH_A_OCPM) 2600 else if (rh_a & RH_A_OCPM)
2601 temp |= 0x0008; 2601 temp |= HUB_CHAR_INDV_PORT_OCPM;
2602 desc->wHubCharacteristics = cpu_to_le16(temp); 2602 desc->wHubCharacteristics = cpu_to_le16(temp);
2603 retval = u132_read_pcimem(u132, roothub.b, &rh_b); 2603 retval = u132_read_pcimem(u132, roothub.b, &rh_b);
2604 if (retval) 2604 if (retval)