Commit 346c5583 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.19-rc6' of... 

Merge tag 'regulator-fix-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "A trivial fix adding a missing memory allocation check"

* tag 'regulator-fix-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: fp9931: Add missing memory allocation check
parents afb923b8 e3b76494

drivers/regulator/fp9931.c

+3 −0
Original line number Diff line number Diff line
@@ -439,6 +439,9 @@ static int fp9931_probe(struct i2c_client *client) 
	int i;



	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	data->regmap = devm_regmap_init_i2c(client, &regmap_config);

	if (IS_ERR(data->regmap))

		return dev_err_probe(&client->dev, PTR_ERR(data->regmap),