diff --git a/[refs] b/[refs]
index 0e69059d5b0a..e3b6279e615b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b22f5d94c432e97df8d85151fcf3da16cee75f04
+refs/heads/master: c16159123d5b3245e2b30023a207606c74032f9c
diff --git a/trunk/sound/oss/pas2_card.c b/trunk/sound/oss/pas2_card.c
index 25f3a22c52ee..7f377ec3486d 100644
--- a/trunk/sound/oss/pas2_card.c
+++ b/trunk/sound/oss/pas2_card.c
@@ -156,9 +156,7 @@ static int __init config_pas_hw(struct address_info *hw_config)
 						 * 0x80
 						 */ , 0xB88);
 
-	pas_write(0x80
-		  | joystick?0x40:0
-		  ,0xF388);
+	pas_write(0x80 | (joystick ? 0x40 : 0), 0xF388);
 
 	if (pas_irq < 0 || pas_irq > 15)
 	{