Home Home > GIT Browse
diff options
authorKeith Busch <keith.busch@intel.com>2014-03-03 11:09:47 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-01 11:36:26 +0200
commit184e1198462223a7347a923d02370bf79207638b (patch)
parent34820fc89c5e635b7381e4060931ca30a63d110a (diff)
NVMe: Initialize device reference count earlier
commit fb35e914b3f88cda9ee6f9d776910c35269c4ecf upstream. If an NVMe device becomes ready but fails to create IO queues, the driver creates a character device handle so the device can be managed. The device reference count needs to be initialized before creating the character device. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 51824d1f23ea..2d3385d3c6a9 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2464,6 +2464,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (result)
goto release;
+ kref_init(&dev->kref);
result = nvme_dev_start(dev);
if (result) {
if (result == -EBUSY)
@@ -2471,7 +2472,6 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto release_pools;
- kref_init(&dev->kref);
result = nvme_dev_add(dev);
if (result)
goto shutdown;