From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:37918 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752867AbcIIOhB (ORCPT ); Fri, 9 Sep 2016 10:37:01 -0400 Subject: Patch "nvme: Call pci_disable_device on the error path." has been added to the 4.4-stable tree To: krisman@linux.vnet.ibm.com, gregkh@linuxfoundation.org, jslaby@suse.cz Cc: , From: Date: Fri, 09 Sep 2016 16:37:01 +0200 In-Reply-To: <87h99qf680.fsf@linux.vnet.ibm.com> Message-ID: <147343182175207@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled nvme: Call pci_disable_device on the error path. to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nvme-call-pci_disable_device-on-the-error-path.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From krisman@linux.vnet.ibm.com Fri Sep 9 16:16:39 2016 From: Gabriel Krisman Bertazi Date: Thu, 08 Sep 2016 18:10:23 -0300 Subject: nvme: Call pci_disable_device on the error path. To: Jiri Slaby Cc: gregkh@linuxfoundation.org, stable@vger.kernel.org, stewart@linux.vnet.ibm.com, mniyer@us.ibm.com, keith.busch@intel.com Message-ID: <87h99qf680.fsf@linux.vnet.ibm.com> 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; } Patches currently in stable-queue which might be from krisman@linux.vnet.ibm.com are queue-4.4/nvme-call-pci_disable_device-on-the-error-path.patch