thermal/core: fix error code in __thermal_cooling_device_register()

[ Upstream commit e49a1e1ee078aee21006192076a8d93335e0daa9 ]

Return an error pointer if ->get_max_state() fails.  The current code
returns NULL which will cause an oops in the callers.

Fixes: c408b3d1d9bb ("thermal: Validate new state in cur_state_store()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 6c54b7bc8a31 ("thermal: core: call put_device() only after device_register() fails")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 96d6082864ee9e12304cac48e1a585fb68447510..b21d886aef22d9be48d86cef0b70f88a2b36374c 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -914,7 +914,8 @@ __thermal_cooling_device_register(struct device_node *np,
        cdev->device.class = &thermal_class;
        cdev->devdata = devdata;
 
-       if (cdev->ops->get_max_state(cdev, &cdev->max_state))
+       ret = cdev->ops->get_max_state(cdev, &cdev->max_state);
+       if (ret)
                goto out_kfree_type;
 
        thermal_cooling_device_setup_sysfs(cdev);