Commit d2153a15 authored by Dan Carpenter's avatar Dan Carpenter Committed by Takashi Iwai

ALSA: es1968: precedence bug in snd_es1968_tea575x_get_pins()

I don't think this works as intended.  '|' higher precedence than ?: so
the bitwize OR "0 | (val & STR_MOST)" is a no-op.

I have re-written it to be more clear.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6214b54c
...@@ -2581,9 +2581,14 @@ static u8 snd_es1968_tea575x_get_pins(struct snd_tea575x *tea) ...@@ -2581,9 +2581,14 @@ static u8 snd_es1968_tea575x_get_pins(struct snd_tea575x *tea)
struct es1968 *chip = tea->private_data; struct es1968 *chip = tea->private_data;
unsigned long io = chip->io_port + GPIO_DATA; unsigned long io = chip->io_port + GPIO_DATA;
u16 val = inw(io); u16 val = inw(io);
u8 ret;
return (val & STR_DATA) ? TEA575X_DATA : 0 |
(val & STR_MOST) ? TEA575X_MOST : 0; ret = 0;
if (val & STR_DATA)
ret |= TEA575X_DATA;
if (val & STR_MOST)
ret |= TEA575X_MOST;
return ret;
} }
static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output) static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment