thermal/drivers/bcm2835: Remove buggy call to thermal_of_zone_unregister

The driver is using the devm_thermal_of_zone_device_register().

In the error path of the function calling
devm_thermal_of_zone_device_register(), the function
devm_thermal_of_zone_unregister() should be called instead of
thermal_of_zone_unregister(), otherwise this one will be called twice
when the device is freed.

The same happens for the remove function where the devm_ guarantee the
thermal_of_zone_unregister() will be called, so adding this call in
the remove function will lead to a double free also.

Use devm_ variant in the error path of the probe function.

Remove thermal_of_zone_unregister() in the remove function.

Cc: Florian Fainelli <[email protected]>
Cc: Ray Jui <[email protected]>
Cc: Scott Branden <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index a217d832f24e5880b327d6e273adb923f3043788..3acc9288b310569d69f4ad98e3ef5d24303cef60 100644 (file)
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -275,7 +275,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 
        return 0;
 err_tz:
-       thermal_of_zone_unregister(tz);
+       devm_thermal_of_zone_unregister(&pdev->dev, tz);
 err_clk:
        clk_disable_unprepare(data->clk);
 
@@ -285,10 +285,8 @@ err_clk:
 static int bcm2835_thermal_remove(struct platform_device *pdev)
 {
        struct bcm2835_thermal_data *data = platform_get_drvdata(pdev);
-       struct thermal_zone_device *tz = data->tz;
 
        debugfs_remove_recursive(data->debugfsdir);
-       thermal_of_zone_unregister(tz);
        clk_disable_unprepare(data->clk);
 
        return 0;