Merge "usb: phy-msm-usb: Fix bug in handling POWER_SUPPLY_PROP_TYPE" (e4e6b6a6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/phy/phy-msm-usb.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -4198,6 +4198,20 @@ static int otg_power_set_property_usb(struct power_supply *psy,
		case POWER_SUPPLY_PROP_TYPE:
		psy->type = val->intval;

		/*
		* If charger detection is done by the USB driver,
		* motg->chg_type is already assigned in the
		* charger detection work.
		*
		* There is a possibility of overriding the
		* actual charger type with power supply type
		* charger. For example USB PROPRIETARY charger
		* does not exist in power supply enum and it
		* gets overridden as DCP.
		*/
		if (motg->chg_state == USB_CHG_STATE_DETECTED)
		break;

		switch (psy->type) {
		case POWER_SUPPLY_TYPE_USB:
		motg->chg_type = USB_SDP_CHARGER;