From b0e34bc725af1a88179d5500c936205305d70a12 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Mon, 23 Apr 2012 10:41:03 -0700 Subject: [PATCH] --- yaml --- r: 305860 b: refs/heads/master c: 425d247680d050fe3ee7e53b9cf0240bf6b4b351 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/ntc_thermistor.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; }