Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / tty / serial / kgdboc.c

diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
index 2b42a01a81c6984ace5d8b343d6920c4a0ed748a..3f63d834cbc93ee03f65afdf0b00463438daa007 100644 (file)
--- a/drivers/tty/serial/kgdboc.c
+++ b/drivers/tty/serial/kgdboc.c
@@ -145,6 +145,8 @@ __setup("kgdboc=", kgdboc_option_setup);
 
 static void cleanup_kgdboc(void)
 {
+       if (kgdb_unregister_nmi_console())
+               return;
        kgdboc_unregister_kbd();
        if (configured == 1)
                kgdb_unregister_io_module(&kgdboc_io_ops);
@@ -198,11 +200,18 @@ do_register:
        if (err)
                goto noconfig;
 
+       err = kgdb_register_nmi_console();
+       if (err)
+               goto nmi_con_failed;
+
        configured = 1;
 
        return 0;
 
+nmi_con_failed:
+       kgdb_unregister_io_module(&kgdboc_io_ops);
 noconfig:
+       kgdboc_unregister_kbd();
        config[0] = 0;
        configured = 0;
        cleanup_kgdboc();