---

yaml --- r: 273839 b: refs/heads/master c: 469738e h: refs/heads/master i: 273837: b615af5 273835: 616aa8a 273831: 63b960b 273823: 9ed03d5 v: v3
git-mirror · Oct 13, 2011 · 8ff50d5 · 8ff50d5
1 parent 7587344
commit 8ff50d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d11e6158307bed3f178399a4e6216eec67d16200
+refs/heads/master: 469738e675524b6aa029ecd46bdda3f878b12eff
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
@@ -1450,6 +1450,8 @@ static struct xenbus_driver blkfront = {
 
 static int __init xlblk_init(void)
 {
+	int ret;
+
 	if (!xen_domain())
 		return -ENODEV;
 
@@ -1459,7 +1461,13 @@ static int __init xlblk_init(void)
 		return -ENODEV;
 	}
 
-	return xenbus_register_frontend(&blkfront);
+	ret = xenbus_register_frontend(&blkfront);
+	if (ret) {
+		unregister_blkdev(XENVBD_MAJOR, DEV_NAME);
+		return ret;
+	}
+
+	return 0;
 }
 module_init(xlblk_init);