diff options
| author |   Devendra Naga <devendra.aaru@gmail.com> | 2013-03-04 16:52:47 +0000 |
|---|---|---|
| committer |   Zhang Rui <rui.zhang@intel.com> | 2013-03-11 23:09:24 +0800 |
| commit | fb84d9907f0ff0e3f7d70d55039ddf0f78d2a472 (patch) | |
| tree | ae2bac5cb75616afe177950c0e5cb19533612085 /drivers/thermal/rcar_thermal.c | |
| parent | Thermal: kirkwood: Convert to devm_ioremap_resource() (diff) | |
| download | linux-dev-fb84d9907f0ff0e3f7d70d55039ddf0f78d2a472.tar.xz linux-dev-fb84d9907f0ff0e3f7d70d55039ddf0f78d2a472.zip | |
thermal: rcar_thermal: propagate return value of thermal_zone_device_register
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>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal/rcar_thermal.c')
| -rw-r--r-- | drivers/thermal/rcar_thermal.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index ab518140207d..2cc5b6115e3e 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -364,6 +364,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); @@ -438,6 +439,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; } @@ -457,7 +459,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) |