Merge "usb: composite: Fix reporting MaxPower as 0x71 instead of 0x70" into msm-4.14

drivers/usb/gadget/composite.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -546,7 +546,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,
		return 0;
		switch (speed) {
		case USB_SPEED_SUPER:
		return DIV_ROUND_UP(val, 8);
		return (u8)(val / 8);
		default:
		/* only SuperSpeed and faster support > 500mA */
		return DIV_ROUND_UP(min(val, 500U), 2);