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

346c5583 · Linus Torvalds <[email protected]> · 2026-01-23 10:19:18 -08:00

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

Commit: 346c558355dae13f11f4ecb6fcc04be92d0a3497
Parents: afb923b8 · e3b76494

Merge commit. Changes below are compared with the first parent: afb923b8.

Changes

1 files changed · +3 −0

File	Status	Add	Del	Content
drivers/regulator/fp9931.c	modified	+3	−0	View file

drivers/regulator/fp9931.c

View file

diff --git a/drivers/regulator/fp9931.c b/drivers/regulator/fp9931.c
index 69b3c71..7fbcc63 100644
--- a/drivers/regulator/fp9931.c
+++ b/drivers/regulator/fp9931.c
@@ -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),