Commit d3569d16 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 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: virtuoso: Xonar DS: fix polarity of front output
  ALSA: Au88x0 - Reduce the number of playback subdevices of au8830 from 32 to 16
  ALSA: Au88x0 - Support 4 channels playback when AC97 codecs has SDAC bit
  ALSA: HDA: Fix internal microphone on Dell Studio 16 XPS 1645
  ALSA: Don't prompt for CONFIG_SND_COMPRESS_OFFLOAD
  ALSA: HDA: Use LPIB position fix for Macbook Pro 7,1
parents 20c300b1 f0e48b6b

sound/core/Kconfig

+3 −10
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ config SND_HWDEP 
config SND_RAWMIDI

	tristate



config SND_COMPRESS_OFFLOAD

	tristate



# To be effective this also requires INPUT - users should say:

#    select SND_JACK if INPUT=y || INPUT=SND

# to avoid having to force INPUT on.
@@ -154,16 +157,6 @@ config SND_DYNAMIC_MINORS 


	  If you are unsure about this, say N here.



config SND_COMPRESS_OFFLOAD

	tristate "ALSA Compressed audio offload support"

	default n

	help

	  If you want support for offloading compressed audio and have such

	  a hardware, then you should say Y here and also to the DSP driver

	  of your platform.



	  If you are unsure about this, say N here.



config SND_SUPPORT_OLD_API

	bool "Support old ALSA API"

	default y

sound/pci/au88x0/au88x0.c

+7 −6
Original line number Diff line number Diff line
@@ -268,8 +268,14 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 
		card->shortname, chip->io, chip->irq);



	// (4) Alloc components.

	err = snd_vortex_mixer(chip);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}

	// ADB pcm.

	if ((err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_ADB)) < 0) {

	err = snd_vortex_new_pcm(chip, VORTEX_PCM_ADB, NR_PCM);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}
@@ -299,11 +305,6 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 
		return err;

	}

#endif

	// snd_ac97_mixer and Vortex mixer.

	if ((err = snd_vortex_mixer(chip)) < 0) {

		snd_card_free(card);

		return err;

	}

	if ((err = snd_vortex_midi(chip)) < 0) {

		snd_card_free(card);

		return err;

sound/pci/au88x0/au88x0.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#define MIX_SPDIF(x) (vortex->mixspdif[x])



#define NR_WTPB 0x20		/* WT channels per each bank. */

#define NR_PCM	0x10



/* Structs */

typedef struct {

sound/pci/au88x0/au88x0_pcm.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream) 
			runtime->hw = snd_vortex_playback_hw_adb;

#ifdef CHIP_AU8830

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&

			VORTEX_IS_QUAD(vortex) &&

			VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB) {

			runtime->hw.channels_max = 4;

			snd_pcm_hw_constraint_list(runtime, 0,

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2498,6 +2498,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x10de, 0xcb89, "Macbook Pro 7,1", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),

CRA Git | Maintained and supported by SUSTech CRA and CCSE