* [PATCH] ASoC: Remove warnings in ep93xx-i2s.c
@ 2011-03-05 0:57 Alexander Sverdlin
2011-03-06 22:05 ` Ryan Mallon
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Sverdlin @ 2011-03-05 0:57 UTC (permalink / raw)
To: alsa-devel; +Cc: Ryan Mallon
From: Alexander Sverdlin <subaparts@yandex.ru>
Remove warnings in ep93xx-i2s.c
Signed-off-by: Alexander Sverdlin <subaparts@yandex.ru>
---
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] 3+ messages in thread
* Re: [PATCH] ASoC: Remove warnings in ep93xx-i2s.c
2011-03-05 0:57 [PATCH] ASoC: Remove warnings in ep93xx-i2s.c Alexander Sverdlin
@ 2011-03-06 22:05 ` Ryan Mallon
2011-03-07 10:49 ` Liam Girdwood
0 siblings, 1 reply; 3+ messages in thread
From: Ryan Mallon @ 2011-03-06 22:05 UTC (permalink / raw)
To: Alexander Sverdlin; +Cc: alsa-devel, Mark Brown, Liam Girdwood
On 03/05/2011 01:57 PM, 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>
> ---
> 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
>
>
--
Bluewater Systems Ltd - ARM Technology Solution Centre
Ryan Mallon 5 Amuri Park, 404 Barbadoes St
ryan@bluewatersys.com PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com New Zealand
Phone: +64 3 3779127 Freecall: Australia 1800 148 751
Fax: +64 3 3779135 USA 1800 261 2934
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: Remove warnings in ep93xx-i2s.c
2011-03-06 22:05 ` Ryan Mallon
@ 2011-03-07 10:49 ` Liam Girdwood
0 siblings, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2011-03-07 10:49 UTC (permalink / raw)
To: Ryan Mallon; +Cc: alsa-devel, Mark Brown, Alexander Sverdlin
On Mon, 2011-03-07 at 11:05 +1300, Ryan Mallon wrote:
> On 03/05/2011 01:57 PM, 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-07 10:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-05 0:57 [PATCH] ASoC: Remove warnings in ep93xx-i2s.c Alexander Sverdlin
2011-03-06 22:05 ` Ryan Mallon
2011-03-07 10:49 ` Liam Girdwood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).