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

diff --combined sound/soc/codecs/wm8350.c
index ec0efc1443ba770a6c40a2e18c90b117931823bd,1db957d5476630a3053c85749b310026ffe0efcc..0e8b3aaf6c8d698e9dad1f25fdccbabc9ee9f1ef
--- 1/sound/soc/codecs/wm8350.c
--- 2/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@@ -283,16 -283,18 +283,16 @@@ static int pga_event(struct snd_soc_dap
                out->ramp = WM8350_RAMP_UP;
                out->active = 1;
  
 -              if (!delayed_work_pending(&codec->dapm.delayed_work))
 -                      schedule_delayed_work(&codec->dapm.delayed_work,
 -                                            msecs_to_jiffies(1));
 +              schedule_delayed_work(&codec->dapm.delayed_work,
 +                                    msecs_to_jiffies(1));
                break;
  
        case SND_SOC_DAPM_PRE_PMD:
                out->ramp = WM8350_RAMP_DOWN;
                out->active = 0;
  
 -              if (!delayed_work_pending(&codec->dapm.delayed_work))
 -                      schedule_delayed_work(&codec->dapm.delayed_work,
 -                                            msecs_to_jiffies(1));
 +              schedule_delayed_work(&codec->dapm.delayed_work,
 +                                    msecs_to_jiffies(1));
                break;
        }
  
@@@ -1301,7 -1303,7 +1301,7 @@@ static irqreturn_t wm8350_hpl_jack_hand
        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 -1320,7 +1318,7 @@@ static irqreturn_t wm8350_hpr_jack_hand
        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;
  }