From: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Mon, 10 Jun 2019 04:50:35 +0000 (+0800)
Subject: Revert "UBUNTU: SAUCE: nvme: add quirk to not call disable function when suspending"
X-Git-Tag: Ubuntu-4.15.0-55.60~45
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=af9e76ef7a035dc0d384acd0a44e6758c47bd0b6

Revert "UBUNTU: SAUCE: nvme: add quirk to not call disable function when suspending"

BugLink: https://bugs.launchpad.net/bugs/1808957

This reverts commit 5277ad40aa618b25c4a0bb6b3826cc2a0d004464.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: Timo Aaltonen <tjaalton@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 3a9c47851f6a..266cda83844a 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2708,8 +2708,7 @@ static const struct pci_device_id nvme_id_table[] = {
 		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |
 				NVME_QUIRK_MEDIUM_PRIO_SQ },
 	{ PCI_VDEVICE(INTEL, 0xf1a6),	/* Intel 760p/Pro 7600p */
-		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN |
-				NVME_QUIRK_NO_DISABLE, },
+		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 	{ PCI_VDEVICE(INTEL, 0x5845),	/* Qemu emulated controller */
 		.driver_data = NVME_QUIRK_IDENTIFY_CNS, },
 	{ PCI_DEVICE(0x1c58, 0x0003),	/* HGST adapter */