Skip to content

Commit

Permalink
ALSA: es1968: precedence bug in snd_es1968_tea575x_get_pins()
Browse files Browse the repository at this point in the history
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: 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 13, 2012
1 parent 6214b54 commit d2153a1
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions sound/pci/es1968.c
Original file line number Diff line number Diff line change
Expand Up @@ -2581,9 +2581,14 @@ static u8 snd_es1968_tea575x_get_pins(struct snd_tea575x *tea)
struct es1968 *chip = tea->private_data;
unsigned long io = chip->io_port + GPIO_DATA;
u16 val = inw(io);

return (val & STR_DATA) ? TEA575X_DATA : 0 |
(val & STR_MOST) ? TEA575X_MOST : 0;
u8 ret;

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)
Expand Down

0 comments on commit d2153a1

Please sign in to comment.