Merge commit 'origin'

[linux-2.6-block.git] / drivers / char / hvc_console.c

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index f2e4caf70599efcafa2e235a13fb764545d9a0f9..bf70450a49ccbc403c62917c53f0db73f7328f5d 100644 (file)
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -819,11 +819,11 @@ static int hvc_init(void)
        hvc_driver = drv;
        return 0;
 
-put_tty:
-       put_tty_driver(hvc_driver);
 stop_thread:
        kthread_stop(hvc_task);
        hvc_task = NULL;
+put_tty:
+       put_tty_driver(drv);
 out:
        return err;
 }