Commit 0122835a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "There is nothing to worry you much, only a few small & stable patches
  are found for usual stuff, HD-audio (a Lenovo laptop quirk, a fix for
  minor error handling) and ASoC (trivial fixes for RT298 and WM
  codecs).

  The only remaining major change is the fix for ASoC SX_TLV control
  that was overseen during refactoring, but the fix itself is trivial
  and safe"

* tag 'sound-4.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: wm8962: mark cache_dirty flag after software reset in pm_resume
  ASoC: rt298: fix wrong setting of gpio2_en
  ASoC: wm8904: Correct number of EQ registers
  ALSA: hda - Fix deadlock at error in building PCM
  ASoC: Add info callback for SX_TLV controls
  ASoC: rt298: correct index default value
  ALSA: hda - Fix inverted internal mic on Lenovo G50-80
  ALSA: hdac: Explicitly add io.h
parents 45d80f16 b9b6e4ac

include/sound/soc.h

+4 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	SNDRV_CTL_ELEM_ACCESS_READWRITE, \

	.tlv.p  = (tlv_array),\

	.info = snd_soc_info_volsw, \

	.info = snd_soc_info_volsw_sx, \

	.get = snd_soc_get_volsw_sx,\

	.put = snd_soc_put_volsw_sx, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \
@@ -156,7 +156,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \

	SNDRV_CTL_ELEM_ACCESS_READWRITE, \

	.tlv.p  = (tlv_array), \

	.info = snd_soc_info_volsw, \

	.info = snd_soc_info_volsw_sx, \

	.get = snd_soc_get_volsw_sx, \

	.put = snd_soc_put_volsw_sx, \

	.private_value = (unsigned long)&(struct soc_mixer_control) \
@@ -574,6 +574,8 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, 
	struct snd_ctl_elem_value *ucontrol);

int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_info_volsw_sx(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_info *uinfo);

#define snd_soc_info_bool_ext		snd_ctl_boolean_mono_info

int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

include/sound/wm8904.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
#define WM8904_MIC_REGS  2

#define WM8904_GPIO_REGS 4

#define WM8904_DRC_REGS  4

#define WM8904_EQ_REGS   25

#define WM8904_EQ_REGS   24



/**

 * DRC configurations are specified with a label and a set of register

sound/hda/ext/hdac_ext_bus.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <linux/module.h>

#include <linux/slab.h>

#include <linux/io.h>

#include <sound/hdaudio_ext.h>



MODULE_DESCRIPTION("HDA extended core");

sound/pci/hda/hda_codec.c

+1 −3
Original line number Diff line number Diff line
@@ -3367,10 +3367,8 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec) 
	int dev, err;



	err = snd_hda_codec_parse_pcms(codec);

	if (err < 0) {

		snd_hda_codec_reset(codec);

	if (err < 0)

		return err;

	}



	/* attach a new PCM streams */

	list_for_each_entry(cpcm, &codec->pcm_list_head, list) {

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -819,6 +819,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { 
	SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT_PINCFG_LENOVO_TP410),

	SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo IdeaPad Z560", CXT_FIXUP_MUTE_LED_EAPD),

	SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),

CRA Git | Maintained and supported by SUSTech CRA and CCSE