---

yaml --- r: 335643 b: refs/heads/master c: d2153a1 h: refs/heads/master i: 335641: 84a4ea5 335639: 7507561 v: v3
git-mirror · Nov 13, 2012 · 4cbb7b2 · 4cbb7b2
1 parent 8651897
commit 4cbb7b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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)