diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-27 11:33:01 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-27 11:33:01 -0600 |
| commit | b06e13c38dbd5a03e945ce711f6909c91888f507 (patch) | |
| tree | 5d4514f49463e014d6b40c646796a88ba13d9c09 /drivers/nvme/host/lightnvm.c | |
| parent | c35e30b4727b390ce7a6dd7ead31335320c2b83e (diff) | |
| parent | 7569b90a228ed7dfdc1f92f2c98d7a1b041f22eb (diff) | |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/post-merge
Christoph writes:
"A couple more updates for 4.12. The biggest pile is fc and lpfc
updates from James, but there are various small fixes and cleanups as
well."
Fixes up a few merge issues, and also a warning in
lpfc_nvmet_rcv_unsol_abort() if CONFIG_NVME_TARGET_FC isn't enabled.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme/host/lightnvm.c')
| -rw-r--r-- | drivers/nvme/host/lightnvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index de61a4a03d78..e4e4e60b1224 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c @@ -483,7 +483,7 @@ static void nvme_nvm_end_io(struct request *rq, int error) { struct nvm_rq *rqd = rq->end_io_data; - rqd->ppa_status = nvme_req(rq)->result.u64; + rqd->ppa_status = le64_to_cpu(nvme_req(rq)->result.u64); rqd->error = nvme_req(rq)->status; nvm_end_io(rqd); |