3 files changed, 9 insertions, 2 deletions

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 77fbcd4a69b..529bd5f6521 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -2590,12 +2590,12 @@ static void setup_dig_out_stream(struct hda_codec *codec, hda_nid_t nid,
                                  unsigned int stream_tag, unsigned int format)
 {
         /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
-        if (codec->spdif_ctls & AC_DIG1_ENABLE)
+        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
                 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
                                     codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
         snd_hda_codec_setup_stream(codec, nid, stream_tag, 0, format);
         /* turn on again (if needed) */
-        if (codec->spdif_ctls & AC_DIG1_ENABLE)
+        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
                 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_DIGI_CONVERT_1,
                                     codec->spdif_ctls & 0xff);
 }
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 2f112626f24..aeee5816153 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -654,6 +654,11 @@ struct hda_codec {
 
         struct snd_hwdep *hwdep;        /* assigned hwdep device */
 
+        /* misc flags */
+        unsigned int spdif_status_reset :1; /* needs to toggle SPDIF for each
+                                             * status change
+                                             * (e.g. Realtek codecs)
+                                             */
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         unsigned int power_on :1;       /* current (global) power-state */
         unsigned int power_transition :1; /* power-state in transition */
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7e5422f64ca..8bff732958e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2670,6 +2670,8 @@ static int alc_build_pcms(struct hda_codec *codec)
                         info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_digital_capture);
                         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid;
                 }
+                /* FIXME: do we need this for all Realtek codec models? */
+                codec->spdif_status_reset = 1;
         }
 
         /* If the use of more than one ADC is requested for the current