* [PATCH 4/6] ASoC: Remove warnings in ep93xx-i2s.c
@ 2011-03-07 17:29 Alexander Sverdlin
2011-03-07 17:32 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Sverdlin @ 2011-03-07 17:29 UTC (permalink / raw)
To: alsa-devel; +Cc: Dimitris Papastamos, Ryan Mallon, Brown, Liam Girdwood, Mark
From: Alexander Sverdlin <subaparts@yandex.ru>
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>
---
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 3d4c086..042f4e9 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -313,10 +313,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)
@@ -324,10 +326,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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 4/6] ASoC: Remove warnings in ep93xx-i2s.c
2011-03-07 17:29 [PATCH 4/6] ASoC: Remove warnings in ep93xx-i2s.c Alexander Sverdlin
@ 2011-03-07 17:32 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2011-03-07 17:32 UTC (permalink / raw)
To: Alexander Sverdlin
Cc: Dimitris Papastamos, alsa-devel, Ryan Mallon, Liam Girdwood
On Mon, Mar 07, 2011 at 08:29:58PM +0300, Alexander Sverdlin wrote:
> From: Alexander Sverdlin <subaparts@yandex.ru>
>
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-07 17:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-07 17:29 [PATCH 4/6] ASoC: Remove warnings in ep93xx-i2s.c Alexander Sverdlin
2011-03-07 17:32 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.