| Message ID | 1363102940.3160.2.camel@phoenix (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Tue, 2013-03-12 at 23:42 +0800, Axel Lin wrote: > 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> applied to thermal -next. thanks, rui > --- > drivers/thermal/db8500_thermal.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c > index 61ce60a..6bdcec4 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); > } -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index 61ce60a..6bdcec4 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); }
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> --- drivers/thermal/db8500_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)