diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-23 12:50:13 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-23 12:50:13 -0500 |
| commit | 3095b165a14b1a95eb500bcaf13ad725a27fe825 (patch) | |
| tree | fc63027bb6c613730d309f99767500faadef56ca /sound/soc/imx/mx27vis_wm8974.c | |
| parent | 4dc2ec09b80b32b54821f1776959740283efa5a2 (diff) | |
| parent | 48e3cbb3f67a27d9c2db075f3d0f700246c40caa (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/imx/mx27vis_wm8974.c')
| -rw-r--r-- | sound/soc/imx/mx27vis_wm8974.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
| 180 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; | 180 | struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; |
| 181 | 181 | ||
| 182 | /* disable the PLL */ | 182 | /* disable the PLL */ |
| 183 | return codec_dai->ops->set_pll(codec_dai, IGNORED_ARG, 0, 0); | 183 | return codec_dai->ops->set_pll(codec_dai, IGNORED_ARG, IGNORED_ARG, |
| 184 | 0, 0); | ||
| 184 | } | 185 | } |
| 185 | 186 | ||
| 186 | /* | 187 | /* |