diff --git a/[refs] b/[refs]
index d3db9757017c..b6be331f1c4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41141e64e63dd250a05218b66c91e125f1020b92
+refs/heads/master: 425d247680d050fe3ee7e53b9cf0240bf6b4b351
diff --git a/trunk/drivers/hwmon/ntc_thermistor.c b/trunk/drivers/hwmon/ntc_thermistor.c
index 4be7faff321b..b31bf1d3172a 100644
--- a/trunk/drivers/hwmon/ntc_thermistor.c
+++ b/trunk/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;
 	}