]> git.karo-electronics.de Git - linux-beck.git/commitdiff
thermal: db8500: Fix checking return value of thermal_zone_device_register
authorAxel Lin <axel.lin@ingics.com>
Tue, 12 Mar 2013 15:42:20 +0000 (15:42 +0000)
committerZhang Rui <rui.zhang@intel.com>
Tue, 26 Mar 2013 14:07:52 +0000 (22:07 +0800)
thermal_zone_device_register() returns ERR_PTR on error, thus use
IS_ERR rather than IS_ERR_OR_NULL to check return value.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/db8500_thermal.c

index 61ce60a35921d8ca543bcc275a5b7d479b98fa4f..6bdcec474fb1068c6393037cb75186e3546ab05d 100644 (file)
@@ -447,7 +447,7 @@ static int db8500_thermal_probe(struct platform_device *pdev)
        pzone->therm_dev = thermal_zone_device_register("db8500_thermal_zone",
                ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0);
 
-       if (IS_ERR_OR_NULL(pzone->therm_dev)) {
+       if (IS_ERR(pzone->therm_dev)) {
                dev_err(&pdev->dev, "Register thermal zone device failed.\n");
                return PTR_ERR(pzone->therm_dev);
        }