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

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

Merge "regulator: rpm-smd-regulator: Correct the get_optimum_mode function"

parents 17c0e44d cdb64c25

drivers/regulator/rpm-smd-regulator.c

+1 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, 2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -933,10 +933,6 @@ static unsigned int rpm_vreg_get_optimum_mode(struct regulator_dev *rdev, 
	if (load_mA > params[RPM_REGULATOR_PARAM_CURRENT].max)

		load_mA = params[RPM_REGULATOR_PARAM_CURRENT].max;



	rpm_vreg_lock(reg->rpm_vreg);

	RPM_VREG_SET_PARAM(reg, CURRENT, load_mA);

	rpm_vreg_unlock(reg->rpm_vreg);



	return (load_uA >= reg->rpm_vreg->hpm_min_load)

		? REGULATOR_MODE_NORMAL : REGULATOR_MODE_IDLE;

}