]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
nvme: Call pci_disable_device on the error path.
authorGabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Wed, 28 Sep 2016 15:55:21 +0000 (08:55 -0700)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 20 Oct 2016 13:03:38 +0000 (08:03 -0500)
commit4037befc774bd59fa3fa67d6d51ce2bcab140566
tree478e87c819dbc39d3507039e0acafa129981417b
parent6ca7d09d874d0f4092b7104480680dc0cd7384d9
nvme: Call pci_disable_device on the error path.

BugLink: http://bugs.launchpad.net/bugs/1628520
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@suse.cz>
Embarassed-developer: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from linux-stable commit 81e9a969c441d43b1a82b7d27848c0c7e1a5d90d)
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
drivers/nvme/host/pci.c