diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-07 01:29:40 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-07 01:29:40 -0500 |
| commit | de83fb38df2c1418fb7385248d797d3046c5512c (patch) | |
| tree | d6a90754bd4215d5d69be8d3fcc3ffab33835483 /sound | |
| parent | 25e5a7441fa09a08283fe83e507d8eb47150ccd8 (diff) | |
| parent | 51cd02d43c0bc7f55c84f50de23c08554db56ce1 (diff) | |
Merge remote-tracking branch 'asoc/fix/wm8350' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index ec0efc1443ba..0e8b3aaf6c8d 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) | |||
| 1301 | if (device_may_wakeup(wm8350->dev)) | 1301 | if (device_may_wakeup(wm8350->dev)) |
| 1302 | pm_wakeup_event(wm8350->dev, 250); | 1302 | pm_wakeup_event(wm8350->dev, 250); |
| 1303 | 1303 | ||
| 1304 | schedule_delayed_work(&priv->hpl.work, 200); | 1304 | schedule_delayed_work(&priv->hpl.work, msecs_to_jiffies(200)); |
| 1305 | 1305 | ||
| 1306 | return IRQ_HANDLED; | 1306 | return IRQ_HANDLED; |
| 1307 | } | 1307 | } |
| @@ -1318,7 +1318,7 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data) | |||
| 1318 | if (device_may_wakeup(wm8350->dev)) | 1318 | if (device_may_wakeup(wm8350->dev)) |
| 1319 | pm_wakeup_event(wm8350->dev, 250); | 1319 | pm_wakeup_event(wm8350->dev, 250); |
| 1320 | 1320 | ||
| 1321 | schedule_delayed_work(&priv->hpr.work, 200); | 1321 | schedule_delayed_work(&priv->hpr.work, msecs_to_jiffies(200)); |
| 1322 | 1322 | ||
| 1323 | return IRQ_HANDLED; | 1323 | return IRQ_HANDLED; |
| 1324 | } | 1324 | } |