diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2015-01-19 01:34:59 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-25 21:01:12 +0800 |
| commit | 662fc2a6a3d0720b3e4f00fec22ee214cd1204c3 (patch) | |
| tree | 12a2e93369aeca9b5c07533539045a57fa21200b /drivers/usb/host/isp1362-hcd.c | |
| parent | f3c4140dc9c7a1719eba3537eee576050174f93c (diff) | |
| download | linux-stable-662fc2a6a3d0720b3e4f00fec22ee214cd1204c3.tar.gz linux-stable-662fc2a6a3d0720b3e4f00fec22ee214cd1204c3.tar.bz2 linux-stable-662fc2a6a3d0720b3e4f00fec22ee214cd1204c3.zip | |
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>
Diffstat (limited to 'drivers/usb/host/isp1362-hcd.c')
| -rw-r--r-- | drivers/usb/host/isp1362-hcd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c index 75e5876f9d7c..b32ab60cad1e 100644 --- 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; |