瀏覽代碼

m68k: atari_keyb_init operator precedence fix

Fix operator precedence bug in atari_keyb_init, which caused a failure on CT60

Signed-off-by: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Michael Schmitz 16 年之前
父節點
當前提交
1136cf1106
共有 1 個文件被更改,包括 6 次插入3 次删除
  1. 6 3
      arch/m68k/atari/atakeyb.c

+ 6 - 3
arch/m68k/atari/atakeyb.c

@@ -580,13 +580,15 @@ int atari_keyb_init(void)
 	do {
 	do {
 		/* reset IKBD ACIA */
 		/* reset IKBD ACIA */
 		acia.key_ctrl = ACIA_RESET |
 		acia.key_ctrl = ACIA_RESET |
-				(atari_switches & ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0;
+				((atari_switches & ATARI_SWITCH_IKBD) ?
+				 ACIA_RHTID : 0);
 		(void)acia.key_ctrl;
 		(void)acia.key_ctrl;
 		(void)acia.key_data;
 		(void)acia.key_data;
 
 
 		/* reset MIDI ACIA */
 		/* reset MIDI ACIA */
 		acia.mid_ctrl = ACIA_RESET |
 		acia.mid_ctrl = ACIA_RESET |
-				(atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;
+				((atari_switches & ATARI_SWITCH_MIDI) ?
+				 ACIA_RHTID : 0);
 		(void)acia.mid_ctrl;
 		(void)acia.mid_ctrl;
 		(void)acia.mid_data;
 		(void)acia.mid_data;
 
 
@@ -599,7 +601,8 @@ int atari_keyb_init(void)
 				 ACIA_RHTID : ACIA_RLTID);
 				 ACIA_RHTID : ACIA_RLTID);
 
 
 		acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S |
 		acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S |
-				(atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;
+				((atari_switches & ATARI_SWITCH_MIDI) ?
+				 ACIA_RHTID : 0);
 
 
 	/* make sure the interrupt line is up */
 	/* make sure the interrupt line is up */
 	} while ((mfp.par_dt_reg & 0x10) == 0);
 	} while ((mfp.par_dt_reg & 0x10) == 0);