Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58d79e71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Add another HP DV6 quirk
  OSS: soundcard: locking bug in sound_ioctl()
  ASoC: Update links for Wolfson MAINTAINERS entry
  ASoC: Add Dimitris Papastamos to Wolfson maintainers
  ASoC: Add Jassi Brar as Samsung maintainer
parents 85a33188 dd4025bd

MAINTAINERS

+9 −1
Original line number Original line Diff line number Diff line
@@ -5030,6 +5030,12 @@ F: drivers/media/common/saa7146* 
F:	drivers/media/video/*7146*

F:	drivers/media/video/*7146*

F:	include/media/*7146*

F:	include/media/*7146*





SAMSUNG AUDIO (ASoC) DRIVERS

M:	Jassi Brar <jassi.brar@samsung.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/s3c24xx



TLG2300 VIDEO4LINUX-2 DRIVER

TLG2300 VIDEO4LINUX-2 DRIVER

M:	Huang Shijie <shijie8@gmail.com>

M:	Huang Shijie <shijie8@gmail.com>

M:	Kang Yong <kangyong@telegent.com>

M:	Kang Yong <kangyong@telegent.com>
@@ -6472,8 +6478,10 @@ F: include/linux/wm97xx.h 
WOLFSON MICROELECTRONICS DRIVERS

WOLFSON MICROELECTRONICS DRIVERS

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Ian Lartey <ian@opensource.wolfsonmicro.com>

M:	Ian Lartey <ian@opensource.wolfsonmicro.com>

M:	Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc

T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus

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

S:	Supported

F:	Documentation/hwmon/wm83??

F:	Documentation/hwmon/wm83??

F:	drivers/leds/leds-wm83*.c

F:	drivers/leds/leds-wm83*.c

sound/oss/soundcard.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -391,11 +391,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	case SND_DEV_DSP:

	case SND_DEV_DSP:

	case SND_DEV_DSP16:

	case SND_DEV_DSP16:

	case SND_DEV_AUDIO:

	case SND_DEV_AUDIO:

		return audio_ioctl(dev, file, cmd, p);

		ret = audio_ioctl(dev, file, cmd, p);

		break;

		break;





	case SND_DEV_MIDIN:

	case SND_DEV_MIDIN:

		return MIDIbuf_ioctl(dev, file, cmd, p);

		ret = MIDIbuf_ioctl(dev, file, cmd, p);

		break;

		break;





	}

	}

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1747,6 +1747,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { 
		      "HP dv6", STAC_HP_DV5),

		      "HP dv6", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,

	SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x3061,

		      "HP dv6", STAC_HP_DV5), /* HP dv6-1110ax */

		      "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,

	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010,

		      "HP", STAC_HP_DV5),

		      "HP", STAC_HP_DV5),

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,

	SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,