Commit de83fb38 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/fix/wm8350' into tmp

parents 25e5a744 51cd02d4
...@@ -1301,7 +1301,7 @@ static irqreturn_t wm8350_hpl_jack_handler(int irq, void *data) ...@@ -1301,7 +1301,7 @@ static irqreturn_t wm8350_hpl_jack_handler(int irq, void *data)
if (device_may_wakeup(wm8350->dev)) if (device_may_wakeup(wm8350->dev))
pm_wakeup_event(wm8350->dev, 250); 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; return IRQ_HANDLED;
} }
...@@ -1318,7 +1318,7 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data) ...@@ -1318,7 +1318,7 @@ static irqreturn_t wm8350_hpr_jack_handler(int irq, void *data)
if (device_may_wakeup(wm8350->dev)) if (device_may_wakeup(wm8350->dev))
pm_wakeup_event(wm8350->dev, 250); 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; return IRQ_HANDLED;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment