summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-03-21 12:55:04 -0700
committerLen Brown <len.brown@intel.com>2012-03-22 01:07:22 -0400
commit03ee62f0b9919535a1be02f72fe8153255a7fda0 (patch)
tree7c643687a8901ed38fca4f2a6ef046abcd3aa3da
parentde716e32e61fae5d1f0d000008d3f641cec5c9dd (diff)
thermal: spear13xx: checking for NULL instead of IS_ERR()
thermal_zone_device_register() never returns NULL, on error it returns and ERR_PTR(). Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Viresh Kumar <viresh.kumar@st.com> Reviewed-by: Vincenzo Frascino <vincenzo.frascino@st.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/thermal/spear_thermal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index be94413b95a..c2e32df3b16 100644
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -149,9 +149,9 @@ static int spear_thermal_probe(struct platform_device *pdev)
spear_thermal = thermal_zone_device_register("spear_thermal", 0,
stdev, &ops, 0, 0, 0, 0);
- if (!spear_thermal) {
+ if (IS_ERR(spear_thermal)) {
dev_err(&pdev->dev, "thermal zone device is NULL\n");
- ret = -EINVAL;
+ ret = PTR_ERR(spear_thermal);
goto disable_clk;
}