diff options
author | Alexander Sverdlin <subaparts@yandex.ru> | 2011-03-07 12:29:58 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-07 12:32:02 -0500 |
commit | f9c540456ab662a3b5d79c1fa93c51305a97fdf3 (patch) | |
tree | 0c30eb7a0c67edf0d7c9c8f3494ad7255b3886d7 | |
parent | 383f8465d1579635d7b7df5d7a1d1966b6ffb868 (diff) |
ASoC: Remove warnings in ep93xx-i2s.c
Remove warnings in ep93xx-i2s.c
Signed-off-by: Alexander Sverdlin <subaparts@yandex.ru>
Acked-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/ep93xx/ep93xx-i2s.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c index fff579a1c134..4d3c1389d3da 100644 --- a/sound/soc/ep93xx/ep93xx-i2s.c +++ b/sound/soc/ep93xx/ep93xx-i2s.c | |||
@@ -314,10 +314,12 @@ static int ep93xx_i2s_suspend(struct snd_soc_dai *dai) | |||
314 | struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai); | 314 | struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai); |
315 | 315 | ||
316 | if (!dai->active) | 316 | if (!dai->active) |
317 | return; | 317 | return 0; |
318 | 318 | ||
319 | ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_PLAYBACK); | 319 | ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_PLAYBACK); |
320 | ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_CAPTURE); | 320 | ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_CAPTURE); |
321 | |||
322 | return 0; | ||
321 | } | 323 | } |
322 | 324 | ||
323 | static int ep93xx_i2s_resume(struct snd_soc_dai *dai) | 325 | static int ep93xx_i2s_resume(struct snd_soc_dai *dai) |
@@ -325,10 +327,12 @@ static int ep93xx_i2s_resume(struct snd_soc_dai *dai) | |||
325 | struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai); | 327 | struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai); |
326 | 328 | ||
327 | if (!dai->active) | 329 | if (!dai->active) |
328 | return; | 330 | return 0; |
329 | 331 | ||
330 | ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_PLAYBACK); | 332 | ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_PLAYBACK); |
331 | ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_CAPTURE); | 333 | ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_CAPTURE); |
334 | |||
335 | return 0; | ||
332 | } | 336 | } |
333 | #else | 337 | #else |
334 | #define ep93xx_i2s_suspend NULL | 338 | #define ep93xx_i2s_suspend NULL |