diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-27 03:46:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-27 03:46:10 -0400 |
| 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 d86ee1bfc03a..eeed5edd722b 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, | |||
| 588 | ret = siu_dai_spbstart(port_info); | 588 | ret = siu_dai_spbstart(port_info); |
| 589 | if (ret < 0) | 589 | if (ret < 0) |
| 590 | goto fail; | 590 | goto fail; |
| 591 | } else { | ||
| 592 | ret = 0; | ||
| 591 | } | 593 | } |
| 592 | 594 | ||
| 593 | port_info->play_cap |= self; | 595 | port_info->play_cap |= self; |