eeprom: at24: Use dev_err_probe for nvmem register failure

tq-steina · Sasha Levin · commit e284e14dee9e · 2024-05-06T15:26:34.000-04:00
[ Upstream commit a3c1003 ] When using nvmem layouts it is possible devm_nvmem_register returns -EPROBE_DEFER, resulting in an 'empty' in /sys/kernel/debug/devices_deferred. Use dev_err_probe for providing additional information. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Stable-dep-of: f42c970 ("eeprom: at24: fix memory corruption race condition") Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
@@ -761,7 +761,8 @@ static int at24_probe(struct i2c_client *client)
 		pm_runtime_disable(dev);
 		if (!pm_runtime_status_suspended(dev))
 			regulator_disable(at24->vcc_reg);
-		return PTR_ERR(at24->nvmem);
+		return dev_err_probe(dev, PTR_ERR(at24->nvmem),
+				     "failed to register nvmem\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,8 @@ static int at24_probe(struct i2c_client *client)`
`761`	`761`	`pm_runtime_disable(dev);`
`762`	`762`	`if (!pm_runtime_status_suspended(dev))`
`763`	`763`	`regulator_disable(at24->vcc_reg);`
`764`		`- return PTR_ERR(at24->nvmem);`
	`764`	`+ return dev_err_probe(dev, PTR_ERR(at24->nvmem),`
	`765`	`+ "failed to register nvmem\n");`
`765`	`766`	`}`
`766`	`767`
`767`	`768`	`/*`