summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-03-03 16:20:50 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-03 22:46:38 +0800
commit51cd02d43c0bc7f55c84f50de23c08554db56ce1 (patch)
tree1274da630ec538fa1652dcc7a65b5a7b9dcfac4f /sound
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff)
downloadlinux-3.10-51cd02d43c0bc7f55c84f50de23c08554db56ce1.tar.gz
linux-3.10-51cd02d43c0bc7f55c84f50de23c08554db56ce1.tar.bz2
linux-3.10-51cd02d43c0bc7f55c84f50de23c08554db56ce1.zip
ASoC: wm8350: Use jiffies rather than msecs in schedule_delayed_work()
The delay parameter of schedule_delayed_work() is number of jiffies to wait rather than miliseconds. Before commit 6d3c26bcb "ASoC: Use delayed work to debounce WM8350 jack IRQs", the debounce time is 200 miliseconds in wm8350_hp_jack_handler(). So I think this is a bug when convert to use delayed work. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8350.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index fb92fb47d63..1db957d5476 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1303,7 +1303,7 @@ static irqreturn_t wm8350_hpl_jack_handler(int irq, void *data)
if (device_may_wakeup(wm8350->dev))
pm_wakeup_event(wm8350->dev, 250);
- schedule_delayed_work(&priv->hpl.work, 200);
+ schedule_delayed_work(&priv->hpl.work, msecs_to_jiffies(200));
return IRQ_HANDLED;
}
@@ -1320,7 +1320,7 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data)
if (device_may_wakeup(wm8350->dev))
pm_wakeup_event(wm8350->dev, 250);
- schedule_delayed_work(&priv->hpr.work, 200);
+ schedule_delayed_work(&priv->hpr.work, msecs_to_jiffies(200));
return IRQ_HANDLED;
}