Return-Path: Received: from mga14.intel.com ([192.55.52.115]:2872 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbbIIORI (ORCPT ); Wed, 9 Sep 2015 10:17:08 -0400 From: Keith Busch To: stable@vger.kernel.org Cc: Keith Busch , Matthew Wilcox Subject: [PATCH for 3.14-stable] NVMe: Initialize device reference count earlier Date: Wed, 9 Sep 2015 08:17:05 -0600 Message-Id: <1441808225-19506-1-git-send-email-keith.busch@intel.com> Sender: stable-owner@vger.kernel.org List-ID: 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 Signed-off-by: Matthew Wilcox --- drivers/block/nvme-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 87dd4c7..f565212 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; -- 1.7.10.4