| Message ID | 1362415968-2210-1-git-send-email-devendra.aaru@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Mon, 2013-03-04 at 11:52 -0500, Devendra Naga wrote: > thermal_zone_device_register returns a value contained in the pointer itself > use PTR_ERR to obtain the address and return it at the end. > > Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Applied to thermal -next. thanks, rui > --- > drivers/thermal/rcar_thermal.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c > index 28f0919..f1726c9 100644 > --- a/drivers/thermal/rcar_thermal.c > +++ b/drivers/thermal/rcar_thermal.c > @@ -363,6 +363,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) > struct resource *res, *irq; > int mres = 0; > int i; > + int ret = -ENODEV; > int idle = IDLE_INTERVAL; > > common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL); > @@ -441,6 +442,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) > idle); > if (IS_ERR(priv->zone)) { > dev_err(dev, "can't register thermal zone\n"); > + ret = PTR_ERR(priv->zone); > goto error_unregister; > } > > @@ -460,7 +462,7 @@ error_unregister: > rcar_thermal_for_each_priv(priv, common) > thermal_zone_device_unregister(priv->zone); > > - return -ENODEV; > + return ret; > } > > static int rcar_thermal_remove(struct platform_device *pdev) -- 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/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 28f0919..f1726c9 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -363,6 +363,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) struct resource *res, *irq; int mres = 0; int i; + int ret = -ENODEV; int idle = IDLE_INTERVAL; common = devm_kzalloc(dev, sizeof(*common), GFP_KERNEL); @@ -441,6 +442,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) idle); if (IS_ERR(priv->zone)) { dev_err(dev, "can't register thermal zone\n"); + ret = PTR_ERR(priv->zone); goto error_unregister; } @@ -460,7 +462,7 @@ error_unregister: rcar_thermal_for_each_priv(priv, common) thermal_zone_device_unregister(priv->zone); - return -ENODEV; + return ret; } static int rcar_thermal_remove(struct platform_device *pdev)
thermal_zone_device_register returns a value contained in the pointer itself use PTR_ERR to obtain the address and return it at the end. Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> --- drivers/thermal/rcar_thermal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)