From bb776764ea65f4987a96b3676f18b61050ecf26b Mon Sep 17 00:00:00 2001 From: Mads Ynddal Date: Wed, 8 May 2024 13:09:08 +0200 Subject: [PATCH] fixup! misc/cpp: add explicit cast of void* and change string concat to accomodate C++ --- src/nvme/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvme/core.c b/src/nvme/core.c index a3280cba..9991cc05 100644 --- a/src/nvme/core.c +++ b/src/nvme/core.c @@ -655,7 +655,7 @@ int nvme_init(struct nvme_ctrl *ctrl, const char *bdf, const struct nvme_ctrl_op } memcpy(ctrl->serial, ((char*) vaddr) + NVME_IDENTIFY_CTRL_SERIAL_NUMBER, sizeof(ctrl->serial)); - oacs = le16_to_cpu(*(leint16_t *)(((uint8_t*) vaddr) + NVME_IDENTIFY_CTRL_OACS)); + oacs = le16_to_cpu(*(leint16_t __force *)(((uintptr_t) vaddr) + NVME_IDENTIFY_CTRL_OACS)); if (oacs & NVME_IDENTIFY_CTRL_OACS_DBCONFIG) ret = nvme_init_dbconfig(ctrl);