Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 662fc2a6 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Greg Kroah-Hartman
Browse files

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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3c4140d

drivers/usb/host/isp1362-hcd.c

+6 −2
Original line number Diff line number Diff line
@@ -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;