From 1cb73027eda81fdea69e344596ad3f7f6c31cd6e Mon Sep 17 00:00:00 2001 From: Dimitris Papastamos Date: Mon, 4 Oct 2010 09:37:48 +0100 Subject: [PATCH] --- yaml --- r: 216603 b: refs/heads/master c: 6c20c807cf5a13f61193d39bb718f7a9b5df3813 h: refs/heads/master i: 216601: b5f568e3f71799ea9f73feba3819c7ca283dd438 216599: 32ae103406c7261ba3b6b7eef8f3d677edd3aaf9 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8804.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1e325fe01f4e..e7a0e7f1632e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63 +refs/heads/master: 6c20c807cf5a13f61193d39bb718f7a9b5df3813 diff --git a/trunk/sound/soc/codecs/wm8804.c b/trunk/sound/soc/codecs/wm8804.c index b23c57ca7c26..2657f5c7ff08 100644 --- a/trunk/sound/soc/codecs/wm8804.c +++ b/trunk/sound/soc/codecs/wm8804.c @@ -395,7 +395,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, codec = dai->codec; if (!freq_in || !freq_out) { /* disable the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); return 0; } else { int ret; @@ -406,7 +406,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, return ret; /* power down the PLL before reprogramming it */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); if (!freq_in || !freq_out) return 0; @@ -423,7 +423,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); /* power up the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); } return 0;