13 Nov
2012
13 Nov
'12
8:53 a.m.
At Tue, 13 Nov 2012 10:44:54 +0300, Dan Carpenter wrote:
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
Thanks, applied now.
Takashi
I don't have a way to test this.
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 50169bc..7266020 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -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)