Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / char / virtio_console.c

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index cdf2f5451c767ff0584c3739e8a35e4327cc52e1..060a672ebb7bf3189bd8a7b0e872c1b437347635 100644 (file)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1941,7 +1941,17 @@ static int __init init(void)
        INIT_LIST_HEAD(&pdrvdata.consoles);
        INIT_LIST_HEAD(&pdrvdata.portdevs);
 
-       return register_virtio_driver(&virtio_console);
+       err = register_virtio_driver(&virtio_console);
+       if (err < 0) {
+               pr_err("Error %d registering virtio driver\n", err);
+               goto free;
+       }
+       return 0;
+free:
+       if (pdrvdata.debugfs_dir)
+               debugfs_remove_recursive(pdrvdata.debugfs_dir);
+       class_destroy(pdrvdata.class);
+       return err;
 }
 
 static void __exit fini(void)