Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1136cf11 authored by Michael Schmitz's avatar Michael Schmitz Committed by Linus Torvalds
Browse files

m68k: atari_keyb_init operator precedence fix 



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

Signed-off-by: default avatarMichael Schmitz <schmitz@debian.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2ecbf813

arch/m68k/atari/atakeyb.c

+6 −3
Original line number Diff line number Diff line
@@ -580,13 +580,15 @@ int atari_keyb_init(void) 
	do {

		/* reset IKBD ACIA */

		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_data;



		/* reset MIDI ACIA */

		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_data;
@@ -599,7 +601,8 @@ int atari_keyb_init(void) 
				 ACIA_RHTID : ACIA_RLTID);



		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 */

	} while ((mfp.par_dt_reg & 0x10) == 0);