Unverified Commit 59e305a6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge existing fixes from regulator/for-5.9

parents 9123e3a7 09dad81e

drivers/regulator/cros-ec-regulator.c

+3 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ static int cros_ec_regulator_init_info(struct device *dev, 
	data->voltages_mV =

		devm_kmemdup(dev, resp.voltages_mv,

			     sizeof(u16) * data->num_voltages, GFP_KERNEL);

	if (!data->voltages_mV)

		return -ENOMEM;



	data->desc.n_voltages = data->num_voltages;



	/* Make sure the returned name is always a valid string */

drivers/regulator/fixed.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) 


		drvdata->enable_clock = devm_clk_get(dev, NULL);

		if (IS_ERR(drvdata->enable_clock)) {

			dev_err(dev, "Cant get enable-clock from devicetree\n");

			dev_err(dev, "Can't get enable-clock from devicetree\n");

			return -ENOENT;

		}

	} else {