From baa27566e026088bc4364ac98d3cbd7ad6f0dc6a Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 14 Nov 2012 11:23:54 +0300 Subject: [PATCH] --- yaml --- r: 335644 b: refs/heads/master c: effded75e24c7941961d473e4f4babed4c52af3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/fm801.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index acc2723ffefa..e6ff30a7daa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5 +refs/heads/master: effded75e24c7941961d473e4f4babed4c52af3c diff --git a/trunk/sound/pci/fm801.c b/trunk/sound/pci/fm801.c index cc2e91d15538..c5806f89be1e 100644 --- a/trunk/sound/pci/fm801.c +++ b/trunk/sound/pci/fm801.c @@ -767,9 +767,14 @@ static u8 snd_fm801_tea575x_get_pins(struct snd_tea575x *tea) struct fm801 *chip = tea->private_data; unsigned short reg = inw(FM801_REG(chip, GPIO_CTRL)); struct snd_fm801_tea575x_gpio gpio = *get_tea575x_gpio(chip); - - return (reg & FM801_GPIO_GP(gpio.data)) ? TEA575X_DATA : 0 | - (reg & FM801_GPIO_GP(gpio.most)) ? TEA575X_MOST : 0; + u8 ret; + + ret = 0; + if (reg & FM801_GPIO_GP(gpio.data)) + ret |= TEA575X_DATA; + if (reg & FM801_GPIO_GP(gpio.most)) + ret |= TEA575X_MOST; + return ret; } static void snd_fm801_tea575x_set_direction(struct snd_tea575x *tea, bool output)