Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 216624
b: refs/heads/master
c: a68a3b4
h: refs/heads/master
v: v3
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Oct 12, 2010
1 parent 26fd04e commit 1d8f298
Show file tree
Hide file tree
Showing 2 changed files with 2 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: cca1b2353a364fd51619d0f304dd9681282b864c
refs/heads/master: a68a3b4ed4ecafcf80f4272e8e1f0670b387041e
3 changes: 1 addition & 2 deletions trunk/sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
u32 data;
int is_play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
int is_master;
int ret = 0;

pm_runtime_get_sync(dai->dev);

Expand Down Expand Up @@ -809,7 +808,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
/* fifo init */
fsi_fifo_init(fsi, is_play, dai);

return ret;
return 0;
}

static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
Expand Down

0 comments on commit 1d8f298

Please sign in to comment.