diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
| commit | 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 (patch) | |
| tree | a3413237c8dee15dfe620848fecb37408a096345 /drivers/nvme/target/discovery.c | |
| parent | 30656167bd2347bf867a09cbae2705bd927d3983 (diff) | |
| parent | 8ff0513bdcdd71e84aa561cce216675d43fb41b8 (diff) | |
Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux
From Boris:
"""
Three simple fixes:
- the first one is fixing a non-critical bug in the gpmi driver
- the second one is fixing a bug in the 'automatic NAND timings
selection' feature introduced in 4.9-rc1
- the last one is fixing a false positive uninitialized-var warning
"""
Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers/nvme/target/discovery.c')
| -rw-r--r-- | drivers/nvme/target/discovery.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c index 6f65646e89cf..12f39eea569f 100644 --- a/drivers/nvme/target/discovery.c +++ b/drivers/nvme/target/discovery.c @@ -54,7 +54,7 @@ static void nvmet_format_discovery_entry(struct nvmf_disc_rsp_page_hdr *hdr, /* we support only dynamic controllers */ e->cntlid = cpu_to_le16(NVME_CNTLID_DYNAMIC); e->asqsz = cpu_to_le16(NVMF_AQ_DEPTH); - e->nqntype = type; + e->subtype = type; memcpy(e->trsvcid, port->disc_addr.trsvcid, NVMF_TRSVCID_SIZE); memcpy(e->traddr, port->disc_addr.traddr, NVMF_TRADDR_SIZE); memcpy(e->tsas.common, port->disc_addr.tsas.common, NVMF_TSAS_SIZE); @@ -187,7 +187,7 @@ int nvmet_parse_discovery_cmd(struct nvmet_req *req) case nvme_admin_identify: req->data_len = 4096; switch (le32_to_cpu(cmd->identify.cns)) { - case 0x01: + case NVME_ID_CNS_CTRL: req->execute = nvmet_execute_identify_disc_ctrl; return 0; |