Merge "usb: dwc3-msm: Get usb power_supply from device tree" (bba34cd5) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/dwc3/dwc3-msm.c

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4537,11 +4537,14 @@ static int dwc3_msm_gadget_vbus_draw(struct dwc3_msm *mdwc, unsigned int mA)
	int ret;		int ret;

	if (!mdwc->usb_psy) {		if (!mdwc->usb_psy) {
	mdwc->usb_psy = power_supply_get_by_name("usb");		mdwc->usb_psy = power_supply_get_by_phandle(mdwc->dev->of_node,
	if (!mdwc->usb_psy) {		"qcom,usb-charger");
	dev_err(mdwc->dev, "Could not get usb psy\n");		if (IS_ERR_OR_NULL(mdwc->usb_psy)) {
			dev_info(mdwc->dev, "Could not get usb psy\n");
	return -ENODEV;		return -ENODEV;
	}		}
			} else if (IS_ERR(mdwc->usb_psy)) {
			return 0;
	}		}

	if (mdwc->max_power == mA)		if (mdwc->max_power == mA)