diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2012-11-13 10:44:54 +0300 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2012-11-13 08:51:47 +0100 |
| commit | d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5 (patch) | |
| tree | d2a3f03ecbfc6b06252079be717ac2f7bfe317b1 /sound/pci/es1968.c | |
| parent | Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus (diff) | |
| download | linux-dev-d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5.tar.xz linux-dev-d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5.zip | |
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/pci/es1968.c')
| -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) 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) |