Patchwork sound/ppc/powermac: remove undefined operations

login
register
mail settings
Submitter Andreas Schwab
Date Sept. 11, 2010, 11:16 a.m.
Message ID <m2iq2cfs2u.fsf@igel.home>
Download mbox | patch
Permalink /patch/64509/
State Not Applicable
Headers show

Comments

Andreas Schwab - Sept. 11, 2010, 11:16 a.m.
Modifying an object twice without an intervening sequence point is
undefined.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
 sound/ppc/tumbler.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Takashi Iwai - Sept. 14, 2010, 2:20 p.m.
At Sat, 11 Sep 2010 13:16:41 +0200,
Andreas Schwab wrote:
> 
> Modifying an object twice without an intervening sequence point is
> undefined.
> 
> Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>

Applied now.  Thanks.


Takashi

> ---
>  sound/ppc/tumbler.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
> index 20afdf9..961d982 100644
> --- a/sound/ppc/tumbler.c
> +++ b/sound/ppc/tumbler.c
> @@ -785,7 +785,7 @@ static int snapper_set_capture_source(struct pmac_tumbler *mix)
>  	if (! mix->i2c.client)
>  		return -ENODEV;
>  	if (mix->capture_source)
> -		mix->acs = mix->acs |= 2;
> +		mix->acs |= 2;
>  	else
>  		mix->acs &= ~2;
>  	return i2c_smbus_write_byte_data(mix->i2c.client, TAS_REG_ACS, mix->acs);
> -- 
> 1.7.2.3
> 
> -- 
> Andreas Schwab, schwab@linux-m68k.org
> GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
> "And now for something completely different."
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>

Patch

diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 20afdf9..961d982 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -785,7 +785,7 @@  static int snapper_set_capture_source(struct pmac_tumbler *mix)
 	if (! mix->i2c.client)
 		return -ENODEV;
 	if (mix->capture_source)
-		mix->acs = mix->acs |= 2;
+		mix->acs |= 2;
 	else
 		mix->acs &= ~2;
 	return i2c_smbus_write_byte_data(mix->i2c.client, TAS_REG_ACS, mix->acs);