diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-11-14 11:23:54 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-14 09:34:28 +0100 |
| commit | effded75e24c7941961d473e4f4babed4c52af3c (patch) | |
| tree | 211f7dd1645de24b5898a3daf1fe8298824d5ae0 /sound | |
| parent | d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5 (diff) | |
| download | linux-stable-effded75e24c7941961d473e4f4babed4c52af3c.tar.gz linux-stable-effded75e24c7941961d473e4f4babed4c52af3c.tar.bz2 linux-stable-effded75e24c7941961d473e4f4babed4c52af3c.zip | |
ALSA: fm801: precedence bug in snd_fm801_tea575x_get_pins()
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/fm801.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index cc2e91d15538..c5806f89be1e 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) |