[SRU][Xenial] nvme: Call pci_disable_device on the error path.

[Kamal Mostafa]

From: Gabriel Krisman Bertazi <krisman at linux.vnet.ibm.com>

This fix-up patch from upstream 4.4.21-stable was accidentally omitted from
Xenial.  This is a simple cherry-pick for Xenial only, and does not warrant
a respin (the previous NVMe regression did, but this follow-up does not).

 -Kamal

-----8<-----

BugLink: http://bugs.launchpad.net/bugs/1628250

Commit 5706aca74fe4 ("NVMe: Don't unmap controller registers on reset"),
which backported b00a726a9fd8 to the 4.4.y kernel introduced a
regression in which it didn't call pci_disable_device in the error path
of nvme_pci_enable.

Reported-by: Jiri Slaby <jslaby at suse.cz>
Embarassed-developer: Gabriel Krisman Bertazi <krisman at linux.vnet.ibm.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman at linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
(cherry picked from linux-stable commit 81e9a969c441d43b1a82b7d27848c0c7e1a5d90d)
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 drivers/nvme/host/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 58b9e7c..aef8652 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1772,7 +1772,7 @@ static int nvme_pci_enable(struct nvme_dev *dev)
 	return 0;
 
  disable:
-	pci_release_regions(pdev);
+	pci_disable_device(pdev);
 
 	return result;
 }
-- 
2.7.4