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

Merge branch 'for-3.1' into for-3.2

parents a3c6dac2 21d17dd2

sound/soc/codecs/wm8753.c

+2 −2
Original line number Diff line number Diff line
@@ -1455,8 +1455,8 @@ static int wm8753_probe(struct snd_soc_codec *codec) 
	/* set the update bits */

	snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LADC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_RADC, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LOUT1V, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_ROUT1V, 0x0100, 0x0100);

	snd_soc_update_bits(codec, WM8753_LOUT2V, 0x0100, 0x0100);

sound/soc/pxa/zylonite.c

+4 −4
Original line number Diff line number Diff line
@@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc_card *card) 
	if (clk_pout) {

		pout = clk_get(NULL, "CLK_POUT");

		if (IS_ERR(pout)) {

			dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n",

			dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n",

				PTR_ERR(pout));

			return PTR_ERR(pout);

		}



		ret = clk_enable(pout);

		if (ret != 0) {

			dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",

			dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",

				ret);

			clk_put(pout);

			return ret;

		}



		dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",

		dev_dbg(card->dev, "MCLK enabled at %luHz\n",

			clk_get_rate(pout));

	}
@@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) 
	if (clk_pout) {

		ret = clk_enable(pout);

		if (ret != 0)

			dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",

			dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",

				ret);

	}