Merge tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound fixes from Takashi Iwai:
 "Here are a collection of small fixes after 3.18 merge.

  The urgent one is the fix for kernel panics with linked PCM substream
  triggered by the recent nonatomic PCM ops support.  Other two fixes
  (emu10k1 and bebob) are stable fixes, and one easy PCI ID addition for
  a new Intel HD-audio controller"

* tag 'sound-fix-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda_intel: Add Device IDs for Intel Sunrise Point PCH
  ALSA: emu10k1: Fix deadlock in synth voice lookup
  ALSA: pcm: Fix referred substream in snd_pcm_action_group() unlock loop
  ALSA: bebob: Fix failure to detect source of clock for Terratec Phase 88

4 files changed, 9 insertions, 7 deletions

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 85fe1a216225..bfe1cf6b492f 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -818,7 +818,7 @@ static int snd_pcm_action_group(struct action_ops *ops,
                 /* unlock streams */
                 snd_pcm_group_for_each_entry(s1, substream) {
                         if (s1 != substream) {
-                                if (s->pcm->nonatomic)
+                                if (s1->pcm->nonatomic)
                                         mutex_unlock(&s1->self_group.mutex);
                                 else
                                         spin_unlock(&s1->self_group.lock);
diff --git a/sound/firewire/bebob/bebob_terratec.c b/sound/firewire/bebob/bebob_terratec.c
index eef8ea7d9b97..0e4c0bfc463b 100644
--- a/sound/firewire/bebob/bebob_terratec.c
+++ b/sound/firewire/bebob/bebob_terratec.c
@@ -17,10 +17,10 @@ phase88_rack_clk_src_get(struct snd_bebob *bebob, unsigned int *id)
         unsigned int enable_ext, enable_word;
         int err;
 
-        err = avc_audio_get_selector(bebob->unit, 0, 0, &enable_ext);
+        err = avc_audio_get_selector(bebob->unit, 0, 9, &enable_ext);
         if (err < 0)
                 goto end;
-        err = avc_audio_get_selector(bebob->unit, 0, 0, &enable_word);
+        err = avc_audio_get_selector(bebob->unit, 0, 8, &enable_word);
         if (err < 0)
                 goto end;
 
diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index 3f3ef38d9b6e..874cd76c7b7f 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -85,6 +85,8 @@ snd_emu10k1_ops_setup(struct snd_emux *emux)
  * get more voice for pcm
  *
  * terminate most inactive voice and give it as a pcm voice.
+ *
+ * voice_lock is already held.
  */
 int
 snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
@@ -92,12 +94,10 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
         struct snd_emux *emu;
         struct snd_emux_voice *vp;
         struct best_voice best[V_END];
-        unsigned long flags;
         int i;
 
         emu = hw->synth;
 
-        spin_lock_irqsave(&emu->voice_lock, flags);
         lookup_voices(emu, hw, best, 1); /* no OFF voices */
         for (i = 0; i < V_END; i++) {
                 if (best[i].voice >= 0) {
@@ -113,11 +113,9 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
                         vp->emu->num_voices--;
                         vp->ch = -1;
                         vp->state = SNDRV_EMUX_ST_OFF;
-                        spin_unlock_irqrestore(&emu->voice_lock, flags);
                         return ch;
                 }
         }
-        spin_unlock_irqrestore(&emu->voice_lock, flags);
 
         /* not found */
         return -ENOMEM;
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index aa302fb03fc5..cfcca4c30d4d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -218,6 +218,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6},"
                          "{Intel, LPT},"
                          "{Intel, LPT_LP},"
                          "{Intel, WPT_LP},"
+                         "{Intel, SPT},"
                          "{Intel, HPT},"
                          "{Intel, PBG},"
                          "{Intel, SCH},"
@@ -1998,6 +1999,9 @@ static const struct pci_device_id azx_ids[] = {
         /* Wildcat Point-LP */
         { PCI_DEVICE(0x8086, 0x9ca0),
           .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+        /* Sunrise Point */
+        { PCI_DEVICE(0x8086, 0xa170),
+          .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
         /* Haswell */
         { PCI_DEVICE(0x8086, 0x0a0c),
           .driver_data = AZX_DRIVER_HDMI | AZX_DCAPS_INTEL_HASWELL },