diff options
author | Michael Schmitz <schmitz@biophys.uni-duesseldorf.de> | 2008-09-01 14:27:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 13:57:52 -0400 |
commit | 1136cf11066a32d4ac2a476dac302858d763703d (patch) | |
tree | 4439a496a1484641cb6783dfdfbb9cc82b1910e1 /arch | |
parent | 2ecbf813d5e6361eb7c7520a6f5e6afa168df39a (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/atari/atakeyb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 8a2a53b33616..bb959fbab2dc 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
@@ -580,13 +580,15 @@ int atari_keyb_init(void) | |||
580 | do { | 580 | do { |
581 | /* reset IKBD ACIA */ | 581 | /* reset IKBD ACIA */ |
582 | acia.key_ctrl = ACIA_RESET | | 582 | acia.key_ctrl = ACIA_RESET | |
583 | (atari_switches & ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0; | 583 | ((atari_switches & ATARI_SWITCH_IKBD) ? |
584 | ACIA_RHTID : 0); | ||
584 | (void)acia.key_ctrl; | 585 | (void)acia.key_ctrl; |
585 | (void)acia.key_data; | 586 | (void)acia.key_data; |
586 | 587 | ||
587 | /* reset MIDI ACIA */ | 588 | /* reset MIDI ACIA */ |
588 | acia.mid_ctrl = ACIA_RESET | | 589 | acia.mid_ctrl = ACIA_RESET | |
589 | (atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0; | 590 | ((atari_switches & ATARI_SWITCH_MIDI) ? |
591 | ACIA_RHTID : 0); | ||
590 | (void)acia.mid_ctrl; | 592 | (void)acia.mid_ctrl; |
591 | (void)acia.mid_data; | 593 | (void)acia.mid_data; |
592 | 594 | ||
@@ -599,7 +601,8 @@ int atari_keyb_init(void) | |||
599 | ACIA_RHTID : ACIA_RLTID); | 601 | ACIA_RHTID : ACIA_RLTID); |
600 | 602 | ||
601 | acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | | 603 | acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | |
602 | (atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0; | 604 | ((atari_switches & ATARI_SWITCH_MIDI) ? |
605 | ACIA_RHTID : 0); | ||
603 | 606 | ||
604 | /* make sure the interrupt line is up */ | 607 | /* make sure the interrupt line is up */ |
605 | } while ((mfp.par_dt_reg & 0x10) == 0); | 608 | } while ((mfp.par_dt_reg & 0x10) == 0); |