summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/smartreflex-class1p5.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/smartreflex-class1p5.c b/arch/arm/mach-omap2/smartreflex-class1p5.c
index a6ebabd05b1..349cd55f36b 100644
--- a/arch/arm/mach-omap2/smartreflex-class1p5.c
+++ b/arch/arm/mach-omap2/smartreflex-class1p5.c
@@ -454,6 +454,9 @@ static void sr_class1p5_reset_calib(struct voltagedomain *voltdm, bool reset,
if (work_data->work_active)
sr_class1p5_disable(voltdm, work_data->vdata, 0);
+ /* Ensure worker canceled. */
+ cancel_delayed_work_sync(&work_data->work);
+
omap_voltage_calib_reset(voltdm);
/*