summaryrefslogtreecommitdiffstats
path: root/sound/soc/ep93xx
diff options
context:
space:
mode:
authorAlexander Sverdlin2011-03-07 18:29:58 +0100
committerMark Brown2011-03-07 18:32:02 +0100
commitf9c540456ab662a3b5d79c1fa93c51305a97fdf3 (patch)
tree0c30eb7a0c67edf0d7c9c8f3494ad7255b3886d7 /sound/soc/ep93xx
parentASoC: Extend range of supported sample rates for CS4271 CODEC. (diff)
downloadkernel-qcow2-linux-f9c540456ab662a3b5d79c1fa93c51305a97fdf3.tar.gz
kernel-qcow2-linux-f9c540456ab662a3b5d79c1fa93c51305a97fdf3.tar.xz
kernel-qcow2-linux-f9c540456ab662a3b5d79c1fa93c51305a97fdf3.zip
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>
Diffstat (limited to 'sound/soc/ep93xx')
-rw-r--r--sound/soc/ep93xx/ep93xx-i2s.c8
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)
struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
if (!dai->active)
- return;
+ return 0;
ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_PLAYBACK);
ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_CAPTURE);
+
+ return 0;
}
static int ep93xx_i2s_resume(struct snd_soc_dai *dai)
@@ -325,10 +327,12 @@ static int ep93xx_i2s_resume(struct snd_soc_dai *dai)
struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
if (!dai->active)
- return;
+ return 0;
ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_PLAYBACK);
ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_CAPTURE);
+
+ return 0;
}
#else
#define ep93xx_i2s_suspend NULL