From 047c04ea5e027c06161e1c679b574e4b8e956662 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 15 Mar 2012 19:16:12 +0100 Subject: [PATCH] --- yaml --- r: 305539 b: refs/heads/master c: 5f1cba63a3a65b01a70ac09914176bb3719725d6 h: refs/heads/master i: 305537: 0a41574190d4d6ec0411c0bafbcb83c9f6289438 305535: 1415f009293bf60fe17086108c9bcf8b74325f41 v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 29bf57d8c1fd..ddacbec09f95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b19e6e7b763c7144bfe2ceccf988b64d66d6dd0a +refs/heads/master: 5f1cba63a3a65b01a70ac09914176bb3719725d6 diff --git a/trunk/sound/soc/pxa/pxa2xx-i2s.c b/trunk/sound/soc/pxa/pxa2xx-i2s.c index 609abd51e55f..453b0925a0b5 100644 --- a/trunk/sound/soc/pxa/pxa2xx-i2s.c +++ b/trunk/sound/soc/pxa/pxa2xx-i2s.c @@ -165,7 +165,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, struct pxa2xx_pcm_dma_params *dma_data; BUG_ON(IS_ERR(clk_i2s)); - clk_enable(clk_i2s); + clk_prepare_enable(clk_i2s); clk_ena = 1; pxa_i2s_wait(); @@ -258,7 +258,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, SACR0 &= ~SACR0_ENB; pxa_i2s_wait(); if (clk_ena) { - clk_disable(clk_i2s); + clk_disable_unprepare(clk_i2s); clk_ena = 0; } }