From 4cbb7b28b5f5eddf41b6be38edd4dabc6f26bf14 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 13 Nov 2012 10:44:54 +0300 Subject: [PATCH] --- yaml --- r: 335643 b: refs/heads/master c: d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5 h: refs/heads/master i: 335641: 84a4ea558cbe06eae3bf240906e0817926173be9 335639: 75075614986d80c47f8fb7b2a27d09107d0191f1 v: v3 --- [refs] | 2 +- trunk/sound/pci/es1968.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5b7a1c4f0cee..acc2723ffefa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6214b54cbf0778804de1297444c7661e70bc4d74 +refs/heads/master: d2153a1595ee8235ecf9f9e2d1ac18eee373cbb5 diff --git a/trunk/sound/pci/es1968.c b/trunk/sound/pci/es1968.c index 50169bcfd903..7266020c16cb 100644 --- a/trunk/sound/pci/es1968.c +++ b/trunk/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)