From: Michael Schmitz <schmitz@xxxxxxxxxxxxxxxxxxxxxxxxxx>
Fix operator precedence bug in atari_keyb_init, which caused a failure on CT60
Signed-off-by: Michael Schmitz <schmitz@xxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
---
Please apply for 2.6.27.
arch/m68k/atari/atakeyb.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -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);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
