diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:50:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 18:50:13 +0100 |
| commit | 3095b165a14b1a95eb500bcaf13ad725a27fe825 (patch) | |
| tree | fc63027bb6c613730d309f99767500faadef56ca | |
| parent | 4dc2ec09b80b32b54821f1776959740283efa5a2 (diff) | |
| parent | 48e3cbb3f67a27d9c2db075f3d0f700246c40caa (diff) | |
| download | linux-3095b165a14b1a95eb500bcaf13ad725a27fe825.tar.gz linux-3095b165a14b1a95eb500bcaf13ad725a27fe825.tar.bz2 linux-3095b165a14b1a95eb500bcaf13ad725a27fe825.zip | |
Merge branch 'fix/asoc' into for-linus
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 3 | ||||
| -rw-r--r-- | sound/soc/imx/mx27vis_wm8974.c | 3 | ||||
| -rw-r--r-- | sound/soc/sh/fsi.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 0ac1215dcd9b..e237bf615129 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -463,7 +463,8 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, { u16 *cache = codec->reg_cache; - soc_ac97_ops.write(codec->ac97, reg, val); + if (reg < 0x7c) + soc_ac97_ops.write(codec->ac97, reg, val); reg = reg >> 1; if (reg < (ARRAY_SIZE(wm9712_reg))) cache[reg] = val; diff --git a/sound/soc/imx/mx27vis_wm8974.c b/sound/soc/imx/mx27vis_wm8974.c index 0267d2d91685..07d2a248438c 100644 --- a/sound/soc/imx/mx27vis_wm8974.c +++ b/sound/soc/imx/mx27vis_wm8974.c @@ -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); } /* diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 9c49c11c43ce..42813b808389 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -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; |