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

Commit f8c85fe1 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/tps516312' into regulator-next

parents f4244c68 dbc70518
Loading
Loading
Loading
Loading
+15 −0
Original line number Original line Diff line number Diff line
@@ -236,6 +236,21 @@ static int tps51632_probe(struct i2c_client *client,
		return -EINVAL;
		return -EINVAL;
	}
	}


	if (pdata->enable_pwm_dvfs) {
		if ((pdata->base_voltage_uV < TPS51632_MIN_VOLATGE) ||
		    (pdata->base_voltage_uV > TPS51632_MAX_VOLATGE)) {
			dev_err(&client->dev, "Invalid base_voltage_uV setting\n");
			return -EINVAL;
		}

		if ((pdata->max_voltage_uV) &&
		    ((pdata->max_voltage_uV < TPS51632_MIN_VOLATGE) ||
		     (pdata->max_voltage_uV > TPS51632_MAX_VOLATGE))) {
			dev_err(&client->dev, "Invalid max_voltage_uV setting\n");
			return -EINVAL;
		}
	}

	tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
	tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
	if (!tps) {
	if (!tps) {
		dev_err(&client->dev, "Memory allocation failed\n");
		dev_err(&client->dev, "Memory allocation failed\n");