* [patch] ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins()
@ 2012-11-14 8:23 Dan Carpenter
2012-11-14 8:35 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2012-11-14 8:23 UTC (permalink / raw)
To: Jaroslav Kysela
Cc: alsa-devel, Mauro Carvalho Chehab, Takashi Iwai, Rusty Russell,
kernel-janitors, Hans de Goede, Hans Verkuil
There is a precedence bug because | has higher precedence than ?:. This
code was cut and pasted and I fixed a similar bug a few days ago.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index cc2e91d..c5806f8 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -767,9 +767,14 @@ static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea)
struct fm801 *chip = tea->private_data;
unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);
-
- return (reg & FM801_GPIO_GP(gpio.data)) ? TEA575X_DATA : 0 |
- (reg & FM801_GPIO_GP(gpio.most)) ? TEA575X_MOST : 0;
+ u8 ret;
+
+ ret = 0;
+ if (reg & FM801_GPIO_GP(gpio.data))
+ ret |= TEA575X_DATA;
+ if (reg & FM801_GPIO_GP(gpio.most))
+ ret |= TEA575X_MOST;
+ return ret;
}
static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins()
2012-11-14 8:23 [patch] ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins() Dan Carpenter
@ 2012-11-14 8:35 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2012-11-14 8:35 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel, Mauro Carvalho Chehab, Rusty Russell, kernel-janitors,
Hans de Goede, Hans Verkuil
At Wed, 14 Nov 2012 11:23:54 +0300,
Dan Carpenter wrote:
>
> There is a precedence bug because | has higher precedence than ?:. This
> code was cut and pasted and I fixed a similar bug a few days ago.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks, applied.
Takashi
>
> diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
> index cc2e91d..c5806f8 100644
> --- a/sound/pci/fm801.c
> +++ b/sound/pci/fm801.c
> @@ -767,9 +767,14 @@ static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea)
> struct fm801 *chip = tea->private_data;
> unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL));
> struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip);
> -
> - return (reg & FM801_GPIO_GP(gpio.data)) ? TEA575X_DATA : 0 |
> - (reg & FM801_GPIO_GP(gpio.most)) ? TEA575X_MOST : 0;
> + u8 ret;
> +
> + ret = 0;
> + if (reg & FM801_GPIO_GP(gpio.data))
> + ret |= TEA575X_DATA;
> + if (reg & FM801_GPIO_GP(gpio.most))
> + ret |= TEA575X_MOST;
> + return ret;
> }
>
> static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output)
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-14 8:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-14 8:23 [patch] ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins() Dan Carpenter
2012-11-14 8:35 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox