1. 23 9月, 2011 2 次提交
    • T
      Merge branch 'fix/asoc' into for-linus · 3127b6aa
      Takashi Iwai 提交于
      3127b6aa
    • T
      ALSA: usb-audio - clear chip->probing on error exit · 362e4e49
      Thomas Pfaff 提交于
      The Terratec Aureon 5.1 USB sound card support is broken since kernel
      2.6.39.
      2.6.39 introduced power management support for USB sound cards that added
      a probing flag in struct snd_usb_audio.
      
      During the probe of the card it gives following error message :
      
      usb 7-2: new full speed USB device number 2 using uhci_hcd
      cannot find UAC_HEADER
      snd-usb-audio: probe of 7-2:1.3 failed with error -5
      input: USB Audio as
      /devices/pci0000:00/0000:00:1d.1/usb7/7-2/7-2:1.3/input/input6
      generic-usb 0003:0CCD:0028.0001: input: USB HID v1.00 Device [USB Audio]
      on usb-0000:00:1d.1-2/input3
      
      I can not comment about that "cannot find UAC_HEADER" error, but until
      2.6.38 the card worked anyway.
      With 2.6.39 chip->probing remains 1 on error exit, and any later ioctl
      stops in snd_usb_autoresume with -ENODEV.
      Signed-off-by: NThomas Pfaff <tpfaff@gmx.net>
      Cc: <stable@kernel.org> [2.6.39+]
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      362e4e49
  2. 22 9月, 2011 2 次提交
  3. 21 9月, 2011 1 次提交
  4. 20 9月, 2011 2 次提交
  5. 19 9月, 2011 1 次提交
  6. 16 9月, 2011 1 次提交
  7. 15 9月, 2011 2 次提交
    • A
      ALSA: pcm - fix race condition in wait_for_avail() · 763437a9
      Arjan van de Ven 提交于
      wait_for_avail() in pcm_lib.c has a race in it (observed in practice by an
      Intel validation group).
      
      The function is supposed to return once space in the buffer has become
      available, or if some timeout happens.  The entity that creates space (irq
      handler of sound driver and some such) will do a wake up on a waitqueue
      that this function registers for.
      
      However there are two races in the existing code
      
      1) If space became available between the caller noticing there was no
         space and this function actually sleeping, the wakeup is missed and the
         timeout condition will happen instead
      
      2) If a wakeup happened but not sufficient space became available, the
         code will loop again and wait for more space.  However, if the second
         wake comes in prior to hitting the schedule_timeout_interruptible(), it
         will be missed, and potentially you'll wait out until the timeout
         happens.
      
      The fix consists of using more careful setting of the current state (so
      that if a wakeup happens in the main loop window, the schedule_timeout()
      falls through) and by checking for available space prior to going into the
      schedule_timeout() loop, but after being on the waitqueue and having the
      state set to interruptible.
      
      [tiwai: the following changes have been added to Arjan's original patch:
       - merged akpm's fix for waitqueue adding order into a single patch
       - reduction of duplicated code of avail check
      ]
      Signed-off-by: NArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Cc: <stable@kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      763437a9
    • T
      Merge branch 'fix/asoc' into for-linus · 4038a12e
      Takashi Iwai 提交于
      4038a12e
  8. 14 9月, 2011 1 次提交
  9. 13 9月, 2011 1 次提交
  10. 12 9月, 2011 1 次提交
  11. 06 9月, 2011 2 次提交
  12. 31 8月, 2011 4 次提交
  13. 29 8月, 2011 1 次提交
  14. 26 8月, 2011 1 次提交
  15. 25 8月, 2011 3 次提交
  16. 24 8月, 2011 4 次提交
  17. 23 8月, 2011 9 次提交
  18. 22 8月, 2011 2 次提交