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

Commit d25f3ef3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "smb-lib: allow reading vbus without presence"

parents c0659d78 f6b4d9be

drivers/power/supply/qcom/smb-lib.c

+0 −6
Original line number Diff line number Diff line
@@ -2250,12 +2250,6 @@ int smblib_get_prop_usb_voltage_max(struct smb_charger *chg, 
int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	int rc = 0;



	rc = smblib_get_prop_usb_present(chg, val);

	if (rc < 0 || !val->intval)

		return rc;



	if (!chg->iio.usbin_v_chan ||

		PTR_ERR(chg->iio.usbin_v_chan) == -EPROBE_DEFER)

		chg->iio.usbin_v_chan = iio_channel_get(chg->dev, "usbin_v");