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

Commit 3095b165 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 4dc2ec09 48e3cbb3

sound/soc/codecs/wm9712.c

+2 −1
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, 
{

	u16 *cache = codec->reg_cache;



	if (reg < 0x7c)

		soc_ac97_ops.write(codec->ac97, reg, val);

	reg = reg >> 1;

	if (reg < (ARRAY_SIZE(wm9712_reg)))

sound/soc/imx/mx27vis_wm8974.c

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ static int mx27vis_hifi_hw_free(struct snd_pcm_substream *substream) 
	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;



	/* disable the PLL */

	return codec_dai->ops->set_pll(codec_dai, IGNORED_ARG, 0, 0);

	return codec_dai->ops->set_pll(codec_dai, IGNORED_ARG, IGNORED_ARG,

				       0, 0);

}



/*

sound/soc/sh/fsi.c

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ static int fsi_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_irq(pdev, 0);

	if (!res || !irq) {

	if (!res || (int)irq <= 0) {

		dev_err(&pdev->dev, "Not enough FSI platform resources.\n");

		ret = -ENODEV;

		goto exit;