diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-11-13 02:44:54 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 02:51:47 -0500 |
commit | d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5 (patch) | |
tree | d2a3f03ecbfc6b06252079be717ac2f7bfe317b1 /sound | |
parent | 6214b54cbf0778804de1297444c7661e70bc4d74 (diff) |
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/es1968.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 50169bcfd903..7266020c16cb 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) | |||
2581 | struct es1968 *chip = tea->private_data; | 2581 | struct es1968 *chip = tea->private_data; |
2582 | unsigned long io = chip->io_port + GPIO_DATA; | 2582 | unsigned long io = chip->io_port + GPIO_DATA; |
2583 | u16 val = inw(io); | 2583 | u16 val = inw(io); |
2584 | 2584 | u8 ret; | |
2585 | return (val & STR_DATA) ? TEA575X_DATA : 0 | | 2585 | |
2586 | (val & STR_MOST) ? TEA575X_MOST : 0; | 2586 | ret = 0; |
2587 | if (val & STR_DATA) | ||
2588 | ret |= TEA575X_DATA; | ||
2589 | if (val & STR_MOST) | ||
2590 | ret |= TEA575X_MOST; | ||
2591 | return ret; | ||
2587 | } | 2592 | } |
2588 | 2593 | ||
2589 | static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output) | 2594 | static void snd_es1968_tea575x_set_direction(struct snd_tea575x *tea, bool output) |