path: root/drivers
diff options
authorDaniel Wagner <>2021-02-12 10:30:15 +0100
committerChristoph Hellwig <>2021-03-05 13:41:03 +0100
commit78570f8873c8cd44c12714c7fa7db2601ec5617d (patch)
tree6949049843f73c1a3096f3ec3f28e0f04bafa4e6 /drivers
parent6e6a6828c517fb6819479bf5187df5f39084eb9e (diff)
nvme-hwmon: Return error code when registration fails
The hwmon pointer wont be NULL if the registration fails. Though the exit code path will assign it to ctrl->hwmon_device. Later nvme_hwmon_exit() will try to free the invalid pointer. Avoid this by returning the error code from hwmon_device_register_with_info(). Fixes: ed7770f66286 ("nvme/hwmon: rework to avoid devm allocation") Signed-off-by: Daniel Wagner <> Signed-off-by: Christoph Hellwig <>
Diffstat (limited to 'drivers')
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c
index 8f9e96986780..0a586d712920 100644
--- a/drivers/nvme/host/hwmon.c
+++ b/drivers/nvme/host/hwmon.c
@@ -248,6 +248,7 @@ int nvme_hwmon_init(struct nvme_ctrl *ctrl)
if (IS_ERR(hwmon)) {
dev_warn(dev, "Failed to instantiate hwmon device\n");
+ return PTR_ERR(hwmon);
ctrl->hwmon_device = hwmon;
return 0;