[RFC] thermal: Fix broken registration if a sensor OF node is missing
diff mbox series

Message ID 20190919214058.8243-1-pmamonov@gmail.com
State RFC, archived
Headers show
  • [RFC] thermal: Fix broken registration if a sensor OF node is missing
Related show

Commit Message

Peter Mamonov Sept. 19, 2019, 9:40 p.m. UTC
When devm_thermal_zone_of_sensor_register() is called from
hwmon_thermal_add_sensor() it is possible that the relevant sensor is
missing an OF node. In this case thermal_zone_of_sensor_register() returns
-EINVAL which causes hwmon_thermal_add_sensor() to fail as well. This patch
changes relevant return code of thermal_zone_of_sensor_register() to
-ENODEV, which is tolerated by hwmon_thermal_add_sensor().

Here is a particular case of such behaviour: the Marvell ethernet PHYs
driver registers hwmon device for the built-in temperature sensor (see
drivers/net/phy/marvell.c). Since the sensor doesn't have associated OF
node devm_hwmon_device_register() returns error which ultimately causes
failure of the PHY driver's probe function.

Fixes: 4e5e4705bf69 ("thermal: introduce device tree parser")
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Cc: stable@vger.kernel.org
 drivers/thermal/of-thermal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index dc5093be553e..34b0cc173f4a 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -493,7 +493,7 @@  thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,
 	if (!dev || !dev->of_node) {
-		return ERR_PTR(-EINVAL);
+		return ERR_PTR(-ENODEV);
 	sensor_np = of_node_get(dev->of_node);