diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-27 09:46:10 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-27 09:46:10 +0200 |
| commit | 274a24c16fa97a1fc67437b191274db2286c7ac3 (patch) | |
| tree | a7a452ec3ef403f647791128556598441c272f07 /sound/soc/sh | |
| parent | 7f06a8b26aba1dc03b42272dc0089a800372c575 (diff) | |
| parent | f68596c6d8711650722b2a54328a088a2c21bc5b (diff) | |
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/siu_dai.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index d86ee1bfc03..eeed5edd722 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -588,6 +588,8 @@ static int siu_dai_prepare(struct snd_pcm_substream *substream, ret = siu_dai_spbstart(port_info); if (ret < 0) goto fail; + } else { + ret = 0; } port_info->play_cap |= self; |