| Message ID | 1473240292-10116-1-git-send-email-axel.lin@ingics.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On 07/09/16 11:24, Axel Lin wrote: > devm_thermal_zone_of_sensor_register can fail, so check it's return value. > > Signed-off-by: Axel Lin <axel.lin@ingics.com> > --- > drivers/thermal/mtk_thermal.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c > index 7b233c7..34169c3 100644 > --- a/drivers/thermal/mtk_thermal.c > +++ b/drivers/thermal/mtk_thermal.c > @@ -584,6 +584,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) > struct resource *res; > const struct of_device_id *of_id; > u64 auxadc_phys_base, apmixed_phys_base; > + struct thermal_zone_device *tzdev; > > mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); > if (!mt) > @@ -666,11 +667,17 @@ static int mtk_thermal_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, mt); > > - devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt, > - &mtk_thermal_ops); > + tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt, > + &mtk_thermal_ops); > + if (IS_ERR(tzdev)) { > + ret = PTR_ERR(tzdev); > + goto err_disable_clk_peri_therm; > + } > > return 0; > > +err_disable_clk_peri_therm: > + clk_disable_unprepare(mt->clk_peri_therm); > err_disable_clk_auxadc: > clk_disable_unprepare(mt->clk_auxadc); > > -- 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/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 7b233c7..34169c3 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -584,6 +584,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) struct resource *res; const struct of_device_id *of_id; u64 auxadc_phys_base, apmixed_phys_base; + struct thermal_zone_device *tzdev; mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) @@ -666,11 +667,17 @@ static int mtk_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mt); - devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt, - &mtk_thermal_ops); + tzdev = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mt, + &mtk_thermal_ops); + if (IS_ERR(tzdev)) { + ret = PTR_ERR(tzdev); + goto err_disable_clk_peri_therm; + } return 0; +err_disable_clk_peri_therm: + clk_disable_unprepare(mt->clk_peri_therm); err_disable_clk_auxadc: clk_disable_unprepare(mt->clk_auxadc);
devm_thermal_zone_of_sensor_register can fail, so check it's return value. Signed-off-by: Axel Lin <axel.lin@ingics.com> --- drivers/thermal/mtk_thermal.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)