]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
thermal: rcar_thermal: Prevent doing work after unbind
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 12 Oct 2018 07:20:16 +0000 (09:20 +0200)
committerEduardo Valentin <edubezval@gmail.com>
Thu, 25 Oct 2018 17:44:55 +0000 (10:44 -0700)
When testing bind/unbind on r8a7791/koelsch:

    WARNING: CPU: 1 PID: 697 at lib/debugobjects.c:329 debug_print_object+0x8c/0xb4
    ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x10

This happens if the workqueue runs after the device has been unbound.
Fix this by cancelling any queued work during remove.

Fixes: e0a5172e9eec7f0d ("thermal: rcar: add interrupt support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
drivers/thermal/rcar_thermal.c

index f0e385dd7a9294637caab53b3195dee6f93790c4..6d3205819da33744e3e1d5456e3c5d58f6e36924 100644 (file)
@@ -469,6 +469,7 @@ static int rcar_thermal_remove(struct platform_device *pdev)
 
        rcar_thermal_for_each_priv(priv, common) {
                rcar_thermal_irq_disable(priv);
+               cancel_delayed_work_sync(&priv->work);
                if (priv->chip->use_of_thermal)
                        thermal_remove_hwmon_sysfs(priv->zone);
                else