|
@@ -1736,7 +1736,7 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl)
|
|
|
if (dev->ctrl.admin_q)
|
|
|
blk_put_queue(dev->ctrl.admin_q);
|
|
|
kfree(dev->queues);
|
|
|
- kfree(dev->ctrl.opal_dev);
|
|
|
+ free_opal_dev(dev->ctrl.opal_dev);
|
|
|
kfree(dev);
|
|
|
}
|
|
|
|
|
@@ -1786,14 +1786,17 @@ static void nvme_reset_work(struct work_struct *work)
|
|
|
if (result)
|
|
|
goto out;
|
|
|
|
|
|
- if ((dev->ctrl.oacs & NVME_CTRL_OACS_SEC_SUPP) && !dev->ctrl.opal_dev) {
|
|
|
- dev->ctrl.opal_dev =
|
|
|
- init_opal_dev(&dev->ctrl, &nvme_sec_submit);
|
|
|
+ if (dev->ctrl.oacs & NVME_CTRL_OACS_SEC_SUPP) {
|
|
|
+ if (!dev->ctrl.opal_dev)
|
|
|
+ dev->ctrl.opal_dev =
|
|
|
+ init_opal_dev(&dev->ctrl, &nvme_sec_submit);
|
|
|
+ else if (was_suspend)
|
|
|
+ opal_unlock_from_suspend(dev->ctrl.opal_dev);
|
|
|
+ } else {
|
|
|
+ free_opal_dev(dev->ctrl.opal_dev);
|
|
|
+ dev->ctrl.opal_dev = NULL;
|
|
|
}
|
|
|
|
|
|
- if (was_suspend)
|
|
|
- opal_unlock_from_suspend(dev->ctrl.opal_dev);
|
|
|
-
|
|
|
result = nvme_setup_io_queues(dev);
|
|
|
if (result)
|
|
|
goto out;
|