Fixes for 5.10

[thirdparty/kernel/stable-queue.git] / queue-5.10 / eeprom-at24-use-dev_err_probe-for-nvmem-register-fai.patch

diff --git a/queue-5.10/eeprom-at24-use-dev_err_probe-for-nvmem-register-fai.patch b/queue-5.10/eeprom-at24-use-dev_err_probe-for-nvmem-register-fai.patch
new file mode 100644 (file)
index 0000000..59d3743
--- /dev/null
+++ b/queue-5.10/eeprom-at24-use-dev_err_probe-for-nvmem-register-fai.patch
@@ -0,0 +1,39 @@
+From 5f8813c15d4781a4ed4ba66c13f804e69ba92c33 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 16 May 2023 10:05:53 +0200
+Subject: eeprom: at24: Use dev_err_probe for nvmem register failure
+
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+
+[ Upstream commit a3c10035d12f5ec10915d5c00c2e8f7d7c066182 ]
+
+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: f42c97027fb7 ("eeprom: at24: fix memory corruption race condition")
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/misc/eeprom/at24.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
+index 305ffad131a29..b100bbc888668 100644
+--- a/drivers/misc/eeprom/at24.c
++++ b/drivers/misc/eeprom/at24.c
+@@ -762,7 +762,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");
+       }
+ 
+       /*
+-- 
+2.43.0
+