Commit a1a54303 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: Use LPIB quirk for Dell Inspiron m101z/1120
  sound: Prevent buffer overflow in OSS load_mixer_volumes
  ASoC: codecs: wm8753: Fix register cache incoherency
  ASoC: codecs: wm9090: Fix register cache incoherency
  ASoC: codecs: wm8962: Fix register cache incoherency
  ASoC: codecs: wm8955: Fix register cache incoherency
  ASoC: codecs: wm8904: Fix register cache incoherency
  ASoC: codecs: wm8741: Fix register cache incoherency
  ASoC: codecs: wm8523: Fix register cache incoherency
  ASoC: codecs: max98088: Fix register cache incoherency
  ASoC: codecs: Add missing control_type initialization
parents d864b7b4 ea78484b

sound/oss/soundcard.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int *load_mixer_volumes(char *name, int *levels, int present) 
	int             i, n;



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

		if (strcmp(name, mixer_vols[i].name) == 0) {

		if (strncmp(name, mixer_vols[i].name, 32) == 0) {

			if (present)

				mixer_vols[i].num = i;

			return mixer_vols[i].levels;
@@ -99,7 +99,7 @@ int *load_mixer_volumes(char *name, int *levels, int present) 
	}

	n = num_mixer_volumes++;



	strcpy(mixer_vols[n].name, name);

	strncpy(mixer_vols[n].name, name, 32);



	if (present)

		mixer_vols[n].num = n;

sound/pci/hda/hda_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2300,6 +2300,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1028, 0x0470, "Dell Inspiron 1120", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),

sound/soc/codecs/max98088.c

+4 −6
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct max98088_cdata { 
};



struct max98088_priv {

       u8 reg_cache[M98088_REG_CNT];

       enum max98088_type devtype;

       void *control_data;

       struct max98088_pdata *pdata;
@@ -1588,7 +1587,7 @@ static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai, 


static void max98088_sync_cache(struct snd_soc_codec *codec)

{

       struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);

       u16 *reg_cache = codec->reg_cache;

       int i;



       if (!codec->cache_sync)
@@ -1599,14 +1598,14 @@ static void max98088_sync_cache(struct snd_soc_codec *codec) 
       /* write back cached values if they're writeable and

        * different from the hardware default.

        */

       for (i = 1; i < ARRAY_SIZE(max98088->reg_cache); i++) {

       for (i = 1; i < codec->driver->reg_cache_size; i++) {

               if (!max98088_access[i].writable)

                       continue;



               if (max98088->reg_cache[i] == max98088_reg[i])

               if (reg_cache[i] == max98088_reg[i])

                       continue;



               snd_soc_write(codec, i, max98088->reg_cache[i]);

               snd_soc_write(codec, i, reg_cache[i]);

       }



       codec->cache_sync = 0;
@@ -1951,7 +1950,6 @@ static int max98088_probe(struct snd_soc_codec *codec) 
       int ret = 0;



       codec->cache_sync = 1;

       memcpy(codec->reg_cache, max98088_reg, sizeof(max98088_reg));



       ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);

       if (ret != 0) {

sound/soc/codecs/wm8523.c

+5 −4
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static const char *wm8523_supply_names[WM8523_NUM_SUPPLIES] = { 
/* codec private data */

struct wm8523_priv {

	enum snd_soc_control_type control_type;

	u16 reg_cache[WM8523_REGISTER_COUNT];

	struct regulator_bulk_data supplies[WM8523_NUM_SUPPLIES];

	unsigned int sysclk;

	unsigned int rate_constraint_list[WM8523_NUM_RATES];
@@ -314,6 +313,7 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec, 
				 enum snd_soc_bias_level level)

{

	struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);

	u16 *reg_cache = codec->reg_cache;

	int ret, i;



	switch (level) {
@@ -344,7 +344,7 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec, 
			/* Sync back default/cached values */

			for (i = WM8523_AIF_CTRL1;

			     i < WM8523_MAX_REGISTER; i++)

				snd_soc_write(codec, i, wm8523->reg_cache[i]);

				snd_soc_write(codec, i, reg_cache[i]);





			msleep(100);
@@ -414,6 +414,7 @@ static int wm8523_resume(struct snd_soc_codec *codec) 
static int wm8523_probe(struct snd_soc_codec *codec)

{

	struct wm8523_priv *wm8523 = snd_soc_codec_get_drvdata(codec);

	u16 *reg_cache = codec->reg_cache;

	int ret, i;



	codec->hw_write = (hw_write_t)i2c_master_send;
@@ -470,8 +471,8 @@ static int wm8523_probe(struct snd_soc_codec *codec) 
	}



	/* Change some default settings - latch VU and enable ZC */

	wm8523->reg_cache[WM8523_DAC_GAINR] |= WM8523_DACR_VU;

	wm8523->reg_cache[WM8523_DAC_CTRL3] |= WM8523_ZC;

	reg_cache[WM8523_DAC_GAINR] |= WM8523_DACR_VU;

	reg_cache[WM8523_DAC_CTRL3] |= WM8523_ZC;



	wm8523_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

sound/soc/codecs/wm8741.c

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = { 
/* codec private data */

struct wm8741_priv {

	enum snd_soc_control_type control_type;

	u16 reg_cache[WM8741_REGISTER_COUNT];

	struct regulator_bulk_data supplies[WM8741_NUM_SUPPLIES];

	unsigned int sysclk;

	struct snd_pcm_hw_constraint_list *sysclk_constraints;
@@ -422,6 +421,7 @@ static int wm8741_resume(struct snd_soc_codec *codec) 
static int wm8741_probe(struct snd_soc_codec *codec)

{

	struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec);

	u16 *reg_cache = codec->reg_cache;

	int ret = 0;



	ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type);
@@ -437,10 +437,10 @@ static int wm8741_probe(struct snd_soc_codec *codec) 
	}



	/* Change some default settings - latch VU */

	wm8741->reg_cache[WM8741_DACLLSB_ATTENUATION] |= WM8741_UPDATELL;

	wm8741->reg_cache[WM8741_DACLMSB_ATTENUATION] |= WM8741_UPDATELM;

	wm8741->reg_cache[WM8741_DACRLSB_ATTENUATION] |= WM8741_UPDATERL;

	wm8741->reg_cache[WM8741_DACRLSB_ATTENUATION] |= WM8741_UPDATERM;

	reg_cache[WM8741_DACLLSB_ATTENUATION] |= WM8741_UPDATELL;

	reg_cache[WM8741_DACLMSB_ATTENUATION] |= WM8741_UPDATELM;

	reg_cache[WM8741_DACRLSB_ATTENUATION] |= WM8741_UPDATERL;

	reg_cache[WM8741_DACRLSB_ATTENUATION] |= WM8741_UPDATERM;



	snd_soc_add_controls(codec, wm8741_snd_controls,

			     ARRAY_SIZE(wm8741_snd_controls));

CRA Git | Maintained and supported by SUSTech CRA and CCSE