From 736f8b4761d34bc2bfb091404ec614f3673bc5d4 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 22 Sep 2020 10:18:37 +0800 Subject: [PATCH] nvme: fix the parameter order for nvme_get_log in nvme_get_fw_slot_info stable inclusion from linux-4.19.105 commit e517ef194900d47f552d5ea1cb5d43b06642b47a -------------------------------- commit f25372ffc3f6c2684b57fb718219137e6ee2b64c upstream. nvme fw-activate operation will get bellow warning log, fix it by update the parameter order [ 113.231513] nvme nvme0: Get FW SLOT INFO log error Fixes: 0e98719b0e4b ("nvme: simplify the API for getting log pages") Reported-by: Sujith Pandel Reviewed-by: David Milburn Signed-off-by: Yi Zhang Signed-off-by: Keith Busch Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman Signed-off-by: Yang Yingliang --- drivers/nvme/host/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5e28b6189e45..903c00620415 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3455,7 +3455,7 @@ static void nvme_get_fw_slot_info(struct nvme_ctrl *ctrl) if (!log) return; - if (nvme_get_log(ctrl, NVME_NSID_ALL, 0, NVME_LOG_FW_SLOT, log, + if (nvme_get_log(ctrl, NVME_NSID_ALL, NVME_LOG_FW_SLOT, 0, log, sizeof(*log), 0)) dev_warn(ctrl->device, "Get FW SLOT INFO log error\n"); kfree(log); -- GitLab