aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nvme/host/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/nvme/host/pci.c')
-rw-r--r--drivers/nvme/host/pci.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index fed803232edc..9a3d69b8df98 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2145,14 +2145,14 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
2145 return result; 2145 return result;
2146} 2146}
2147 2147
2148static void nvme_reset_notify(struct pci_dev *pdev, bool prepare) 2148static void nvme_reset_prepare(struct pci_dev *pdev)
2149{ 2149{
2150 struct nvme_dev *dev = pci_get_drvdata(pdev); 2150 nvme_dev_disable(pci_get_drvdata(pdev), false);
2151}
2151 2152
2152 if (prepare) 2153static void nvme_reset_done(struct pci_dev *pdev)
2153 nvme_dev_disable(dev, false); 2154{
2154 else 2155 nvme_reset(pci_get_drvdata(pdev));
2155 nvme_reset(dev);
2156} 2156}
2157 2157
2158static void nvme_shutdown(struct pci_dev *pdev) 2158static void nvme_shutdown(struct pci_dev *pdev)
@@ -2275,7 +2275,8 @@ static const struct pci_error_handlers nvme_err_handler = {
2275 .error_detected = nvme_error_detected, 2275 .error_detected = nvme_error_detected,
2276 .slot_reset = nvme_slot_reset, 2276 .slot_reset = nvme_slot_reset,
2277 .resume = nvme_error_resume, 2277 .resume = nvme_error_resume,
2278 .reset_notify = nvme_reset_notify, 2278 .reset_prepare = nvme_reset_prepare,
2279 .reset_done = nvme_reset_done,
2279}; 2280};
2280 2281
2281static const struct pci_device_id nvme_id_table[] = { 2282static const struct pci_device_id nvme_id_table[] = {