diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 19:40:08 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 19:40:08 +0100 |
| commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
| tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /sound/soc/sh/siu_dai.c | |
| parent | 5e27fb78df95e027723af2c90ecc9b4527ae59e9 (diff) | |
| parent | d30e5d897c3da7c2d17c8112331b66ed953eec78 (diff) | |
| download | kernel_goldelico_gta04-76962be8491b18ae7ff4fd6a4accd398bdb402a2.zip kernel_goldelico_gta04-76962be8491b18ae7ff4fd6a4accd398bdb402a2.tar.gz kernel_goldelico_gta04-76962be8491b18ae7ff4fd6a4accd398bdb402a2.tar.bz2 | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'sound/soc/sh/siu_dai.c')
| -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 d86ee1b..eeed5ed 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; |