|
@@ -848,9 +848,6 @@ static void nvme_start_keep_alive(struct nvme_ctrl *ctrl)
|
|
|
if (unlikely(ctrl->kato == 0))
|
|
|
return;
|
|
|
|
|
|
- INIT_DELAYED_WORK(&ctrl->ka_work, nvme_keep_alive_work);
|
|
|
- memset(&ctrl->ka_cmd, 0, sizeof(ctrl->ka_cmd));
|
|
|
- ctrl->ka_cmd.common.opcode = nvme_admin_keep_alive;
|
|
|
schedule_delayed_work(&ctrl->ka_work, ctrl->kato * HZ);
|
|
|
}
|
|
|
|
|
@@ -3484,6 +3481,10 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
|
|
|
INIT_WORK(&ctrl->fw_act_work, nvme_fw_act_work);
|
|
|
INIT_WORK(&ctrl->delete_work, nvme_delete_ctrl_work);
|
|
|
|
|
|
+ INIT_DELAYED_WORK(&ctrl->ka_work, nvme_keep_alive_work);
|
|
|
+ memset(&ctrl->ka_cmd, 0, sizeof(ctrl->ka_cmd));
|
|
|
+ ctrl->ka_cmd.common.opcode = nvme_admin_keep_alive;
|
|
|
+
|
|
|
ret = ida_simple_get(&nvme_instance_ida, 0, 0, GFP_KERNEL);
|
|
|
if (ret < 0)
|
|
|
goto out;
|