Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 305539
b: refs/heads/master
c: 5f1cba6
h: refs/heads/master
i:
  305537: 0a41574
  305535: 1415f00
v: v3
  • Loading branch information
Philipp Zabel authored and Mark Brown committed Apr 1, 2012
1 parent be90d7c commit 047c04e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b19e6e7b763c7144bfe2ceccf988b64d66d6dd0a
refs/heads/master: 5f1cba63a3a65b01a70ac09914176bb3719725d6
4 changes: 2 additions & 2 deletions trunk/sound/soc/pxa/pxa2xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 047c04e

Please sign in to comment.