Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283959
b: refs/heads/master
c: 27f478a
h: refs/heads/master
i:
  283957: 2105406
  283955: 9fb4b56
  283951: 5961604
v: v3
  • Loading branch information
Mark Brown committed Dec 14, 2011
1 parent a2a0a45 commit 1911831
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 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: 20e757f79b9956a91f4ba0f33cc3f34efe6eb188
refs/heads/master: 27f478a65ff7b67b843250f0a2d1e8b306bf57b6
4 changes: 0 additions & 4 deletions trunk/sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -893,8 +893,6 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
u32 flags = fsi_get_info_flags(fsi);
u32 data = 0;

pm_runtime_get_sync(dev);

/* clock setting */
if (fsi_is_clk_master(fsi))
data = DIMD | DOMD;
Expand Down Expand Up @@ -951,8 +949,6 @@ static void fsi_hw_shutdown(struct fsi_priv *fsi,
{
if (fsi_is_clk_master(fsi))
fsi_set_master_clk(dev, fsi, fsi->rate, 0);

pm_runtime_put_sync(dev);
}

static int fsi_dai_startup(struct snd_pcm_substream *substream,
Expand Down

0 comments on commit 1911831

Please sign in to comment.