Merge branch 'topic/pcm-indirect-fixes' into for-next

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --combined sound/pci/hda/hda_codec.c
index ccbb0d12b8cc34f9b481ebce0b21171270013e41,26d348b47867d6d595aa8701a3cd779bf01d6204..0957813939e5cfbcc0d4632059a36c7e8f164616
--- 1/sound/pci/hda/hda_codec.c
--- 2/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@@ -27,7 -27,7 +27,7 @@@
  #include <linux/pm.h>
  #include <linux/pm_runtime.h>
  #include <sound/core.h>
 -#include "hda_codec.h"
 +#include <sound/hda_codec.h>
  #include <sound/asoundef.h>
  #include <sound/tlv.h>
  #include <sound/initval.h>
@@@ -3935,7 -3935,8 +3935,8 @@@ void snd_hda_bus_reset_codecs(struct hd
  
        list_for_each_codec(codec, bus) {
                /* FIXME: maybe a better way needed for forced reset */
-               cancel_delayed_work_sync(&codec->jackpoll_work);
+               if (current_work() != &codec->jackpoll_work.work)
+                       cancel_delayed_work_sync(&codec->jackpoll_work);
  #ifdef CONFIG_PM
                if (hda_codec_is_power_on(codec)) {
                        hda_call_codec_suspend(codec);