Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALSA: es1968: precedence bug in snd_es1968_tea575x_get_pins()

Browse source 
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>
This commit is contained in:
Dan Carpenter 2012-11-13 10:44:54 +03:00 committed by Takashi Iwai
parent 6214b54cbf
commit d2153a1595
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sound/pci/es1968.c
View file

@ -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);
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)