Unverified Commit 9b8756d6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.13' of... 

Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-5.14
parents b3cc8ec0 adf1471b

drivers/regulator/cros-ec-regulator.c

+2 −1
Original line number Diff line number Diff line
@@ -225,8 +225,9 @@ static int cros_ec_regulator_probe(struct platform_device *pdev) 


	drvdata->dev = devm_regulator_register(dev, &drvdata->desc, &cfg);

	if (IS_ERR(drvdata->dev)) {

		ret = PTR_ERR(drvdata->dev);

		dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);

		return PTR_ERR(drvdata->dev);

		return ret;

	}



	platform_set_drvdata(pdev, drvdata);