Merge tag 'idmapped-mounts-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / thermal / da9062-thermal.c

diff --git a/drivers/thermal/da9062-thermal.c b/drivers/thermal/da9062-thermal.c
index 4d74994..180edec 100644 (file)
--- a/drivers/thermal/da9062-thermal.c
+++ b/drivers/thermal/da9062-thermal.c
@@ -95,7 +95,7 @@ static void da9062_thermal_poll_on(struct work_struct *work)
                thermal_zone_device_update(thermal->zone,
                                           THERMAL_EVENT_UNSPECIFIED);
 
-               delay = msecs_to_jiffies(thermal->zone->passive_delay);
+               delay = thermal->zone->passive_delay_jiffies;
                queue_delayed_work(system_freezable_wq, &thermal->work, delay);
                return;
        }
@@ -245,7 +245,7 @@ static int da9062_thermal_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev,
                "TJUNC temperature polling period set at %d ms\n",
-               thermal->zone->passive_delay);
+               jiffies_to_msecs(thermal->zone->passive_delay_jiffies));
 
        ret = platform_get_irq_byname(pdev, "THERMAL");
        if (ret < 0) {