---

yaml --- r: 323252 b: refs/heads/master c: 0ac1314 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · 4bb547c · 4bb547c
1 parent db22ffe
commit 4bb547c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22fff826e715e9727d3c7a69f15e602a9801b673
+refs/heads/master: 0ac13140d796eb1e2f8956aea97a6e5e4ebcf981
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
@@ -1720,7 +1720,7 @@ static struct pci_driver nvme_driver = {
 
 static int __init nvme_init(void)
 {
-	int result = -EBUSY;
+	int result;
 
 	nvme_thread = kthread_run(nvme_kthread, NULL, "nvme");
 	if (IS_ERR(nvme_thread))
@@ -1730,7 +1730,7 @@ static int __init nvme_init(void)
 	if (result < 0)
 		goto kill_kthread;
 	else if (result > 0)
-	    nvme_major = result;
+		nvme_major = result;
 
 	result = pci_register_driver(&nvme_driver);
 	if (result)