diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-01-07 19:08:49 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-01-09 13:47:08 -0500 |
| commit | b8a38ea64dc714a64f8fb76e311a4f15a3f67861 (patch) | |
| tree | 8cf26b22c6592b7456aef2c8e39a4f0d7679522a | |
| parent | 6299358d198a0635da2dd3c4b3ec37789e811e44 (diff) | |
| download | linux-0-day-b8a38ea64dc714a64f8fb76e311a4f15a3f67861.tar.gz linux-0-day-b8a38ea64dc714a64f8fb76e311a4f15a3f67861.tar.xz | |
nvme: don't initlialize ctrl->cntlid twice
ctrl->cntlid will already be initialized from id->cntlid for
non-NVME_F_FABRICS controllers few lines below. For NVME_F_FABRICS
controllers this field should already be initialized, otherwise the
check
if (ctrl->cntlid != le16_to_cpu(id->cntlid))
below will always be a no-op.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/nvme/host/core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 8485be6bb895a..150e49723c15a 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2502,7 +2502,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->oaes = le32_to_cpu(id->oaes); atomic_set(&ctrl->abort_limit, id->acl + 1); ctrl->vwc = id->vwc; - ctrl->cntlid = le16_to_cpup(&id->cntlid); if (id->mdts) max_hw_sectors = 1 << (id->mdts + page_shift - 9); else |