From 4bb547c39a0005e47627fa6b89ec1af4e982b3fa Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Tue, 31 Jul 2012 13:31:15 -0400 Subject: [PATCH] --- yaml --- r: 323252 b: refs/heads/master c: 0ac13140d796eb1e2f8956aea97a6e5e4ebcf981 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9289c02f8776..255403f84aab 100644 --- 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 index 064e86a6bb4e..0ba6b7cb344b 100644 --- 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)