sound fixes
Linus,
please pull sound fixes for v2.6.36 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
containing only safe changes: a trivial fix for the old OSS error path, a quirk entry for HD-audio, and changes of MAINTAINERS file.
Thanks!
Takashi
===
Dan Carpenter (1):
OSS: soundcard: locking bug in sound_ioctl()
Luke Yelavich (1):
ALSA: hda - Add another HP DV6 quirk
Mark Brown (3):
ASoC: Add Jassi Brar as Samsung maintainer
ASoC: Add Dimitris Papastamos to Wolfson maintainers
ASoC: Update links for Wolfson MAINTAINERS entry
--- MAINTAINERS | 10 +++++++++- sound/oss/soundcard.c | 4 ++-- sound/pci/hda/patch_sigmatel.c | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-)
MAINTAINERS +9 -1
@@ -5030,6 +5030,12 @@ F: drivers/media/common/saa7146* F: drivers/media/video/*7146* F: include/media/*7146* +SAMSUNG AUDIO (ASoC) DRIVERS +M: Jassi Brar <[email protected]> +L: [email protected] (moderated for non-subscribers) +S: Supported +F: sound/soc/s3c24xx + TLG2300 VIDEO4LINUX-2 DRIVER M: Huang Shijie <[email protected]> M: Kang Yong <[email protected]>
@@ -6472,8 +6478,10 @@ F: include/linux/wm97xx.h WOLFSON MICROELECTRONICS DRIVERS M: Mark Brown <[email protected]> M: Ian Lartey <[email protected]> +M: Dimitris Papastamos <[email protected]> +T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus -W: http://opensource.wolfsonmicro.com/node/8 +W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices S: Supported F: Documentation/hwmon/wm83?? F: drivers/leds/leds-wm83*.c
sound/oss/soundcard.c +2 -2
@@ -391,11 +391,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case SND_DEV_DSP :case SND_DEV_DSP16 :case SND_DEV_AUDIO : -return audio_ioctl (dev, file, cmd, p); + ret =audio_ioctl (dev, file, cmd, p);break ;case SND_DEV_MIDIN : -return MIDIbuf_ioctl (dev, file, cmd, p); + ret =MIDIbuf_ioctl (dev, file, cmd, p);break ; }
sound/pci/hda/patch_sigmatel.c +2 -0
@@ -1747,6 +1747,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { "HP dv6", STAC_HP_DV5),SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x3061 ,"HP dv6" ,STAC_HP_DV5 ),/* HP dv6-1110ax */ +SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x363e , +"HP DV6" ,STAC_HP_DV5 ),SND_PCI_QUIRK_MASK (PCI_VENDOR_ID_HP ,0xfff0 ,0x7010 ,"HP" ,STAC_HP_DV5 ), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,