summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-07 14:29:40 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-07 14:29:40 +0800
commitde83fb38df2c1418fb7385248d797d3046c5512c (patch)
treed6a90754bd4215d5d69be8d3fcc3ffab33835483 /sound
parent25e5a7441fa09a08283fe83e507d8eb47150ccd8 (diff)
parent51cd02d43c0bc7f55c84f50de23c08554db56ce1 (diff)
downloadlinux-3.10-de83fb38df2c1418fb7385248d797d3046c5512c.tar.gz
linux-3.10-de83fb38df2c1418fb7385248d797d3046c5512c.tar.bz2
linux-3.10-de83fb38df2c1418fb7385248d797d3046c5512c.zip
Merge remote-tracking branch 'asoc/fix/wm8350' into tmp
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 ec0efc1443b..0e8b3aaf6c8 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1301,7 +1301,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;
}
@@ -1318,7 +1318,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;
}