From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45760 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934026AbcILRNQ (ORCPT ); Mon, 12 Sep 2016 13:13:16 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, Jiri Slaby Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gabriel Krisman Bertazi Subject: [PATCH 4.4 155/192] nvme: Call pci_disable_device on the error path. Date: Mon, 12 Sep 2016 19:01:04 +0200 Message-Id: <20160912152205.561733779@linuxfoundation.org> In-Reply-To: <20160912152158.855601725@linuxfoundation.org> References: <20160912152158.855601725@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gabriel Krisman Bertazi 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 Embarassed-developer: Gabriel Krisman Bertazi Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2725,7 +2725,7 @@ static int nvme_pci_enable(struct nvme_d return 0; disable: - pci_release_regions(pdev); + pci_disable_device(pdev); return result; }