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

Commit 79058c4b 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: sound/aoa/fabrics/layout.c: remove unneeded kfree
  ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
  ALSA: hda - Don't spew too many ELD errors
  ALSA: usb-audio - Fix missing mixer dB information
  ALSA: hda - Add "PCM" volume to vmaster slave list
  ALSA: hda - Fix duplicated capture-volume creation for ALC268 models
  ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
  ALSA: snd_usb_caiaq: track submitted output urbs
parents 47c08f31 de75577c

sound/aoa/fabrics/layout.c

+1 −1
Original line number Diff line number Diff line
@@ -1073,10 +1073,10 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) 
	sdev->pcmid = -1;

	list_del(&ldev->list);

	layouts_list_items--;

	kfree(ldev);

 outnodev:

 	of_node_put(sound);

 	layout_device = NULL;

 	kfree(ldev);

	return -ENODEV;

}

sound/pci/ac97/ac97_patch.c

+1 −0
Original line number Diff line number Diff line
@@ -1909,6 +1909,7 @@ static unsigned int ad1981_jacks_whitelist[] = { 
	0x103c0944, /* HP nc6220 */

	0x103c0934, /* HP nc8220 */

	0x103c006d, /* HP nx9105 */

	0x103c300d, /* HP Compaq dc5100 SFF(PT003AW) */

	0x17340088, /* FSC Scenic-W */

	0 /* end */

};

sound/pci/hda/alc268_quirks.c

+18 −18
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ static const struct snd_pci_quirk alc268_ssid_cfg_tbl[] = { 


static const struct alc_config_preset alc268_presets[] = {

	[ALC267_QUANTA_IL1] = {

		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer,

			    alc268_capture_nosrc_mixer },

		.mixers = { alc267_quanta_il1_mixer, alc268_beep_mixer },

		.cap_mixer = alc268_capture_nosrc_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc267_quanta_il1_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -492,8 +492,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

	},

	[ALC268_3ST] = {

		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,

			    alc268_beep_mixer },

		.mixers = { alc268_base_mixer, alc268_beep_mixer },

		.cap_mixer = alc268_capture_alt_mixer,

		.init_verbs = { alc268_base_init_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.dac_nids = alc268_dac_nids,
@@ -507,8 +507,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.input_mux = &alc268_capture_source,

	},

	[ALC268_TOSHIBA] = {

		.mixers = { alc268_toshiba_mixer, alc268_capture_alt_mixer,

			    alc268_beep_mixer },

		.mixers = { alc268_toshiba_mixer, alc268_beep_mixer },

		.cap_mixer = alc268_capture_alt_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_toshiba_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -525,8 +525,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

	},

	[ALC268_ACER] = {

		.mixers = { alc268_acer_mixer, alc268_capture_alt_mixer,

			    alc268_beep_mixer },

		.mixers = { alc268_acer_mixer, alc268_beep_mixer },

		.cap_mixer = alc268_capture_alt_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_acer_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -543,8 +543,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

	},

	[ALC268_ACER_DMIC] = {

		.mixers = { alc268_acer_dmic_mixer, alc268_capture_alt_mixer,

			    alc268_beep_mixer },

		.mixers = { alc268_acer_dmic_mixer, alc268_beep_mixer },

		.cap_mixer = alc268_capture_alt_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_acer_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -561,9 +561,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

	},

	[ALC268_ACER_ASPIRE_ONE] = {

		.mixers = { alc268_acer_aspire_one_mixer,

			    alc268_beep_mixer,

			    alc268_capture_nosrc_mixer },

		.mixers = { alc268_acer_aspire_one_mixer, alc268_beep_mixer},

		.cap_mixer = alc268_capture_nosrc_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_acer_aspire_one_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -579,8 +578,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

	},

	[ALC268_DELL] = {

		.mixers = { alc268_dell_mixer, alc268_beep_mixer,

			    alc268_capture_nosrc_mixer },

		.mixers = { alc268_dell_mixer, alc268_beep_mixer},

		.cap_mixer = alc268_capture_nosrc_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_dell_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -596,8 +595,8 @@ static const struct alc_config_preset alc268_presets[] = { 
		.init_hook = alc_inithook,

	},

	[ALC268_ZEPTO] = {

		.mixers = { alc268_base_mixer, alc268_capture_alt_mixer,

			    alc268_beep_mixer },

		.mixers = { alc268_base_mixer, alc268_beep_mixer },

		.cap_mixer = alc268_capture_alt_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_toshiba_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),
@@ -616,7 +615,8 @@ static const struct alc_config_preset alc268_presets[] = { 
	},

#ifdef CONFIG_SND_DEBUG

	[ALC268_TEST] = {

		.mixers = { alc268_test_mixer, alc268_capture_mixer },

		.mixers = { alc268_test_mixer },

		.cap_mixer = alc268_capture_mixer,

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_volume_init_verbs,

				alc268_beep_init_verbs },

sound/pci/hda/hda_eld.c

+19 −12
Original line number Diff line number Diff line
@@ -144,25 +144,17 @@ static int cea_sampling_frequencies[8] = { 
	SNDRV_PCM_RATE_192000,	/* 7: 192000Hz */

};



static unsigned char hdmi_get_eld_byte(struct hda_codec *codec, hda_nid_t nid,

static unsigned int hdmi_get_eld_data(struct hda_codec *codec, hda_nid_t nid,

					int byte_index)

{

	unsigned int val;



	val = snd_hda_codec_read(codec, nid, 0,

					AC_VERB_GET_HDMI_ELDD, byte_index);



#ifdef BE_PARANOID

	printk(KERN_INFO "HDMI: ELD data byte %d: 0x%x\n", byte_index, val);

#endif



	if ((val & AC_ELDD_ELD_VALID) == 0) {

		snd_printd(KERN_INFO "HDMI: invalid ELD data byte %d\n",

								byte_index);

		val = 0;

	}



	return val & AC_ELDD_ELD_DATA;

	return val;

}



#define GRAB_BITS(buf, byte, lowbit, bits) 		\
@@ -344,11 +336,26 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, 
	if (!buf)

		return -ENOMEM;



	for (i = 0; i < size; i++)

		buf[i] = hdmi_get_eld_byte(codec, nid, i);

	for (i = 0; i < size; i++) {

		unsigned int val = hdmi_get_eld_data(codec, nid, i);

		if (!(val & AC_ELDD_ELD_VALID)) {

			if (!i) {

				snd_printd(KERN_INFO

					   "HDMI: invalid ELD data\n");

				ret = -EINVAL;

				goto error;

			}

			snd_printd(KERN_INFO

				  "HDMI: invalid ELD data byte %d\n", i);

			val = 0;

		} else

			val &= AC_ELDD_ELD_DATA;

		buf[i] = val;

	}



	ret = hdmi_update_eld(eld, buf, size);



error:

	kfree(buf);

	return ret;

}

sound/pci/hda/patch_cirrus.c

+5 −3
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int is_ext_mic(struct hda_codec *codec, unsigned int idx) 
static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin,

			 unsigned int *idxp)

{

	int i;

	int i, idx;

	hda_nid_t nid;



	nid = codec->start_nid;
@@ -384,10 +384,12 @@ static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin, 
		type = get_wcaps_type(get_wcaps(codec, nid));

		if (type != AC_WID_AUD_IN)

			continue;

		*idxp = snd_hda_get_conn_index(codec, nid, pin, false);

		if (*idxp >= 0)

		idx = snd_hda_get_conn_index(codec, nid, pin, false);

		if (idx >= 0) {

			*idxp = idx;

			return nid;

		}

	}

	return 0;

}