aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-03-03 03:20:50 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-03 09:46:38 -0500
commit51cd02d43c0bc7f55c84f50de23c08554db56ce1 (patch)
tree1274da630ec538fa1652dcc7a65b5a7b9dcfac4f
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff)
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>
-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 fb92fb47d636..1db957d54766 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)
1303 if (device_may_wakeup(wm8350->dev)) 1303 if (device_may_wakeup(wm8350->dev))
1304 pm_wakeup_event(wm8350->dev, 250); 1304 pm_wakeup_event(wm8350->dev, 250);
1305 1305
1306 schedule_delayed_work(&priv->hpl.work, 200); 1306 schedule_delayed_work(&priv->hpl.work, msecs_to_jiffies(200));
1307 1307
1308 return IRQ_HANDLED; 1308 return IRQ_HANDLED;
1309} 1309}
@@ -1320,7 +1320,7 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data)
1320 if (device_may_wakeup(wm8350->dev)) 1320 if (device_may_wakeup(wm8350->dev))
1321 pm_wakeup_event(wm8350->dev, 250); 1321 pm_wakeup_event(wm8350->dev, 250);
1322 1322
1323 schedule_delayed_work(&priv->hpr.work, 200); 1323 schedule_delayed_work(&priv->hpr.work, msecs_to_jiffies(200));
1324 1324
1325 return IRQ_HANDLED; 1325 return IRQ_HANDLED;
1326} 1326}