Skip to content

Commit

Permalink
ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins()
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Dan Carpenter authored and Takashi Iwai committed Nov 14, 2012
1 parent d2153a1 commit effded7
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions sound/pci/fm801.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit effded7

Please sign in to comment.