From 425d247680d050fe3ee7e53b9cf0240bf6b4b351 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Mon, 23 Apr 2012 10:41:03 -0700 Subject: hwmon: (ntc_thermistor) Return error code from hwmon_device_register hwmon_device_register() never returns a NULL pointer in case of errors, but an error value. Use it. Signed-off-by: Guenter Roeck Reviewed-by: Robert Coulson --- drivers/hwmon/ntc_thermistor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/hwmon') diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c index 4be7faff321b..b31bf1d3172a 100644 --- a/drivers/hwmon/ntc_thermistor.c +++ b/drivers/hwmon/ntc_thermistor.c @@ -382,9 +382,9 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev) } data->hwmon_dev = hwmon_device_register(data->dev); - if (IS_ERR_OR_NULL(data->hwmon_dev)) { + if (IS_ERR(data->hwmon_dev)) { dev_err(data->dev, "unable to register as hwmon device.\n"); - ret = -EINVAL; + ret = PTR_ERR(data->hwmon_dev); goto err_after_sysfs; } -- cgit v1.2.3