]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
nvme: fix the parameter order for nvme_get_log in nvme_get_fw_slot_info
authorYi Zhang <yi.zhang@redhat.com>
Fri, 14 Feb 2020 10:48:02 +0000 (18:48 +0800)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 20 Feb 2020 14:35:33 +0000 (08:35 -0600)
BugLink: https://bugs.launchpad.net/bugs/1864046
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 <sujith_pandel@dell.com>
Reviewed-by: David Milburn <dmilburn@redhat.com>
Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 5e9f573dc8e788ecfaaf3eb4f2d24ccc0f040de2)
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
drivers/nvme/host/core.c

index a6b7b242d516184e6f3e95ad990aa532a1460fdb..e703827d27e9c0d6bc192f3bbdc733705cc2074c 100644 (file)
@@ -3853,7 +3853,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);