diff options
Diffstat (limited to 'arch/m68k/atari/debug.c')
-rw-r--r-- | arch/m68k/atari/debug.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c index a547ba9683d1..03cb5e08d7cf 100644 --- a/arch/m68k/atari/debug.c +++ b/arch/m68k/atari/debug.c | |||
@@ -287,6 +287,8 @@ static void __init atari_init_midi_port(int cflag) | |||
287 | 287 | ||
288 | static int __init atari_debug_setup(char *arg) | 288 | static int __init atari_debug_setup(char *arg) |
289 | { | 289 | { |
290 | bool registered; | ||
291 | |||
290 | if (!MACH_IS_ATARI) | 292 | if (!MACH_IS_ATARI) |
291 | return 0; | 293 | return 0; |
292 | 294 | ||
@@ -294,6 +296,7 @@ static int __init atari_debug_setup(char *arg) | |||
294 | /* defaults to ser2 for a Falcon and ser1 otherwise */ | 296 | /* defaults to ser2 for a Falcon and ser1 otherwise */ |
295 | arg = MACH_IS_FALCON ? "ser2" : "ser1"; | 297 | arg = MACH_IS_FALCON ? "ser2" : "ser1"; |
296 | 298 | ||
299 | registered = !!atari_console_driver.write; | ||
297 | if (!strcmp(arg, "ser1")) { | 300 | if (!strcmp(arg, "ser1")) { |
298 | /* ST-MFP Modem1 serial port */ | 301 | /* ST-MFP Modem1 serial port */ |
299 | atari_init_mfp_port(B9600|CS8); | 302 | atari_init_mfp_port(B9600|CS8); |
@@ -317,7 +320,7 @@ static int __init atari_debug_setup(char *arg) | |||
317 | sound_ym.wd_data = sound_ym.rd_data_reg_sel | 0x20; /* strobe H */ | 320 | sound_ym.wd_data = sound_ym.rd_data_reg_sel | 0x20; /* strobe H */ |
318 | atari_console_driver.write = atari_par_console_write; | 321 | atari_console_driver.write = atari_par_console_write; |
319 | } | 322 | } |
320 | if (atari_console_driver.write) | 323 | if (atari_console_driver.write && !registered) |
321 | register_console(&atari_console_driver); | 324 | register_console(&atari_console_driver); |
322 | 325 | ||
323 | return 0; | 326 | return 0; |