From: <gregkh@linuxfoundation.org>
To: krisman@linux.vnet.ibm.com, gregkh@linuxfoundation.org, jslaby@suse.cz
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "nvme: Call pci_disable_device on the error path." has been added to the 4.4-stable tree
Date: Fri, 09 Sep 2016 16:37:01 +0200 [thread overview]
Message-ID: <147343182175207@kroah.com> (raw)
In-Reply-To: <87h99qf680.fsf@linux.vnet.ibm.com>
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 <stable@vger.kernel.org> know about it.
>From krisman@linux.vnet.ibm.com Fri Sep 9 16:16:39 2016
From: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
Date: Thu, 08 Sep 2016 18:10:23 -0300
Subject: nvme: Call pci_disable_device on the error path.
To: Jiri Slaby <jslaby@suse.cz>
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 <krisman@linux.vnet.ibm.com>
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>
---
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
prev parent reply other threads:[~2016-09-09 14:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-01 22:06 [PATCH] NVMe: Don't unmap controller registers on reset Gabriel Krisman Bertazi
2016-09-07 16:06 ` Jiri Slaby
2016-09-08 21:10 ` Gabriel Krisman Bertazi
2016-09-09 14:37 ` gregkh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=147343182175207@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=krisman@linux.vnet.ibm.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).