From: Axel Lin Date: Tue, 12 Mar 2013 15:42:20 +0000 (+0000) Subject: thermal: db8500: Fix checking return value of thermal_zone_device_register X-Git-Tag: v3.10-rc1~42^2~16 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f534e9bf8074ca8c258a1ce0e5224372298976f9;p=uclinux-h8%2Flinux.git thermal: db8500: Fix checking return value of thermal_zone_device_register 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 Signed-off-by: Zhang Rui --- diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index 61ce60a35921..6bdcec474fb1 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c @@ -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); }