From 571cb26d21ddc9ac98735b3047fe6963acf33749 Mon Sep 17 00:00:00 2001 From: Karl Beldan Date: Wed, 13 May 2009 22:16:59 +0200 Subject: [PATCH] --- yaml --- r: 148275 b: refs/heads/master c: 916465a841937a60baac6144ae3f41b0d1560f3b h: refs/heads/master i: 148273: 669a2728b7daa37a4f71ab5d1fffbb12a35c116b 148271: d613fb54171a8942c2eabd52acfe2e5099894c88 v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4cb646b035d8..6c9564671c93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bc04fd1677a956fdd7c5645a09de34ca9a8f1a6 +refs/heads/master: 916465a841937a60baac6144ae3f41b0d1560f3b diff --git a/trunk/sound/soc/pxa/pxa2xx-i2s.c b/trunk/sound/soc/pxa/pxa2xx-i2s.c index bc12a09527f3..4743e262895d 100644 --- a/trunk/sound/soc/pxa/pxa2xx-i2s.c +++ b/trunk/sound/soc/pxa/pxa2xx-i2s.c @@ -262,9 +262,6 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, #ifdef CONFIG_PM static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) { - if (!dai->active) - return 0; - /* store registers */ pxa_i2s.sacr0 = SACR0; pxa_i2s.sacr1 = SACR1; @@ -279,16 +276,14 @@ static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) static int pxa2xx_i2s_resume(struct snd_soc_dai *dai) { - if (!dai->active) - return 0; - pxa_i2s_wait(); - SACR0 = pxa_i2s.sacr0 &= ~SACR0_ENB; + SACR0 = pxa_i2s.sacr0 & ~SACR0_ENB; SACR1 = pxa_i2s.sacr1; SAIMR = pxa_i2s.saimr; SADIV = pxa_i2s.sadiv; - SACR0 |= SACR0_ENB; + + SACR0 = pxa_i2s.sacr0; return 0; }