diff mbox

ASoC: compress: indent an if statement

Message ID 20140514142308.GC18082@mwanda (mailing list archive)
State Accepted
Commit 15b8e94f7460a1285766555011a0feb68e618ecb
Headers show

Commit Message

Dan Carpenter May 14, 2014, 2:23 p.m. UTC 
The return statement was not indented correctly.  I lined up the
condition a bit as well.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Takashi Iwai May 14, 2014, 2:48 p.m. UTC | #1 
At Wed, 14 May 2014 17:23:08 +0300,
Dan Carpenter wrote:
> 
> The return statement was not indented correctly.  I lined up the
> condition a bit as well.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied this one, too.  Thanks.


Takashi

> 
> diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> index 91083e6..e4c7ad5 100644
> --- a/sound/soc/soc-compress.c
> +++ b/sound/soc/soc-compress.c
> @@ -317,8 +317,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
>  		cmd == SND_COMPR_TRIGGER_DRAIN) {
>  
>  		if (platform->driver->compr_ops &&
> -			platform->driver->compr_ops->trigger)
> -		return platform->driver->compr_ops->trigger(cstream, cmd);
> +		    platform->driver->compr_ops->trigger)
> +			return platform->driver->compr_ops->trigger(cstream,
> +								    cmd);
>  	}
>  
>  	if (cstream->direction == SND_COMPRESS_PLAYBACK)
>
Mark Brown May 14, 2014, 3:15 p.m. UTC | #2 
On Wed, May 14, 2014 at 05:23:08PM +0300, Dan Carpenter wrote:
> The return statement was not indented correctly.  I lined up the
> condition a bit as well.

Applied, thanks.
Takashi Iwai May 14, 2014, 3:19 p.m. UTC | #3 
At Wed, 14 May 2014 16:48:11 +0200,
Takashi Iwai wrote:
> 
> At Wed, 14 May 2014 17:23:08 +0300,
> Dan Carpenter wrote:
> > 
> > The return statement was not indented correctly.  I lined up the
> > condition a bit as well.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Applied this one, too.  Thanks.

Oops, I took it mistakenly.  Scratched from my branch now.
Sorry for confusion.


Takashi

> 
> 
> Takashi
> 
> > 
> > diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> > index 91083e6..e4c7ad5 100644
> > --- a/sound/soc/soc-compress.c
> > +++ b/sound/soc/soc-compress.c
> > @@ -317,8 +317,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
> >  		cmd == SND_COMPR_TRIGGER_DRAIN) {
> >  
> >  		if (platform->driver->compr_ops &&
> > -			platform->driver->compr_ops->trigger)
> > -		return platform->driver->compr_ops->trigger(cstream, cmd);
> > +		    platform->driver->compr_ops->trigger)
> > +			return platform->driver->compr_ops->trigger(cstream,
> > +								    cmd);
> >  	}
> >  
> >  	if (cstream->direction == SND_COMPRESS_PLAYBACK)
> >
diff mbox

Patch

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 91083e6..e4c7ad5 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -317,8 +317,9 @@  static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 		cmd == SND_COMPR_TRIGGER_DRAIN) {
 
 		if (platform->driver->compr_ops &&
-			platform->driver->compr_ops->trigger)
-		return platform->driver->compr_ops->trigger(cstream, cmd);
+		    platform->driver->compr_ops->trigger)
+			return platform->driver->compr_ops->trigger(cstream,
+								    cmd);
 	}
 
 	if (cstream->direction == SND_COMPRESS_PLAYBACK)