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

Commit cbe80def authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents c7b64291 eba19fdd

sound/soc/atmel/sam9g20_wm8731.c

+2 −2
Original line number Diff line number Diff line
@@ -222,9 +222,9 @@ static int __init at91sam9g20ek_init(void) 
	}



	pllb = clk_get(NULL, "pllb");

	if (IS_ERR(mclk)) {

	if (IS_ERR(pllb)) {

		printk(KERN_ERR "ASoC: Failed to get PLLB\n");

		ret = PTR_ERR(mclk);

		ret = PTR_ERR(pllb);

		goto err_mclk;

	}

	ret = clk_set_parent(mclk, pllb);

sound/soc/codecs/stac9766.c

+1 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = { 
	.reg_cache_size = sizeof(stac9766_reg),

	.reg_word_size = sizeof(u16),

	.reg_cache_step = 2,

	.reg_cache_default = stac9766_reg,

};



static __devinit int stac9766_probe(struct platform_device *pdev)

sound/soc/codecs/wm8523.c

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	return 0;

	snd_pcm_hw_constraint_list(substream->runtime, 0,

				   SNDRV_PCM_HW_PARAM_RATE,

				   &wm8523->rate_constraint);

sound/soc/codecs/wm8994.c

+2 −0
Original line number Diff line number Diff line
@@ -2515,6 +2515,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8994 = { 
	.resume =	wm8994_resume,

	.read = wm8994_read,

	.write = wm8994_write,

	.readable_register = wm8994_readable,

	.volatile_register = wm8994_volatile,

	.set_bias_level = wm8994_set_bias_level,

};

sound/soc/s3c24xx/smdk_spdif.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev) 
	}



	mout_epll = clk_get(NULL, "mout_epll");

	if (IS_ERR(fout_epll)) {

	if (IS_ERR(mout_epll)) {

		printk(KERN_WARNING "%s: Cannot find mout_epll.\n",

				__func__);

		ret = -EINVAL;
@@ -54,7 +54,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev) 
	}



	sclk_spdif = clk_get(NULL, "sclk_spdif");

	if (IS_ERR(fout_epll)) {

	if (IS_ERR(sclk_spdif)) {

		printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n",

				__func__);

		ret = -EINVAL;