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

Pull sound fixes from Takashi Iwai:
 "Here are a few fixes that have been pending since the previous pull
  request: a regression fix for HD-audio multiple SPDIF / HDMI devices,
  several ALC256 codec fixes, a couple of i915 HDMI audio fixes, and
  various small fixes.

  Nothing exciting, just boring, but things good to have"

* tag 'sound-fix-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - fix headset mic detection problem for one more machine
  ALSA: hda/realtek - Fix Headphone Mic doesn't recording for ALC256
  ALSA: hda - fix "num_steps = 0" error on ALC256
  ALSA: usb-audio: Fix audio output on Roland SC-D70 sound module
  ALSA: hda - add AZX_DCAPS_I915_POWERWELL to Baytrail
  ALSA: hda - only sync BCLK to the display clock for Haswell & Broadwell
  ALSA: hda - Mute headphone pin on suspend on XPS13 9333
  sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
  ALSA: asound.h - use SNDRV_CTL_ELEM_ID_NAME_MAXLEN
  ALSA: hda - potential (but unlikely) uninitialized variable
  ALSA: hda - Fix regression for slave SPDIF setups
  ALSA: intel8x0: Check pci_iomap() success for DEVICE_ALI
  ALSA: hda - simplify azx_has_pm_runtime

1 files changed, 2 insertions, 10 deletions

diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index c0eea1dfe90f..f19da4b47c1d 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -681,13 +681,8 @@ static int seq_timing_event(unsigned char *event_rec)
                         break;
 
                 case TMR_ECHO:
-                        if (seq_mode == SEQ_2)
-                                seq_copy_to_input(event_rec, 8);
-                        else
-                        {
-                                parm = (parm << 8 | SEQ_ECHO);
-                                seq_copy_to_input((unsigned char *) &parm, 4);
-                        }
+                        parm = (parm << 8 | SEQ_ECHO);
+                        seq_copy_to_input((unsigned char *) &parm, 4);
                         break;
 
                 default:;
@@ -1324,7 +1319,6 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
         int mode = translate_mode(file);
         struct synth_info inf;
         struct seq_event_rec event_rec;
-        unsigned long flags;
         int __user *p = arg;
 
         orig_dev = dev = dev >> 4;
@@ -1479,9 +1473,7 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
                 case SNDCTL_SEQ_OUTOFBAND:
                         if (copy_from_user(&event_rec, arg, sizeof(event_rec)))
                                 return -EFAULT;
-                        spin_lock_irqsave(&lock,flags);
                         play_event(event_rec.arr);
-                        spin_unlock_irqrestore(&lock,flags);
                         return 0;
 
                 case SNDCTL_MIDI_INFO: