From 00ccbc94af9b4f72ef1f4309520193daa782fffd Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Sat, 1 Sep 2012 23:49:37 +0400 Subject: [PATCH] --- yaml --- r: 331398 b: refs/heads/master c: 33e1afc3d82697599ccc8dc8f2fa44ffff5ae329 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/virtio_console.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2e83bcf74608..d39de8087726 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b8fa822b71fa91b17c9fb38bcca31e771f7650d +refs/heads/master: 33e1afc3d82697599ccc8dc8f2fa44ffff5ae329 diff --git a/trunk/drivers/char/virtio_console.c b/trunk/drivers/char/virtio_console.c index e88f84390428..8ab9c3d4bf13 100644 --- a/trunk/drivers/char/virtio_console.c +++ b/trunk/drivers/char/virtio_console.c @@ -2099,7 +2099,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)