⛏️ index : haiku.git

bfce786a2ee5aef9b03b0282664d4a296099bdbe [patch]

cb9721d1f298c7c979dc7cca16aaf1a4ee34e7da

10eea8dfae01a8301c19a390de20881335d81eff

bfce786a2ee5aef9b03b0282664d4a296099bdbe.tar.gz

nvme: actually pass parameters to nvme_admin_set_feature()

align len parameter type
noticed by waddlesplash, thanks!

Change-Id: I3d9352f253ca0fc3f2be5966e10a354f3f47ef4b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/9199
Reviewed-by: waddlesplash <waddlesplash@gmail.com>

Diff

 src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp        | 2 +-
 src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme.h       | 2 +-
 src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_ctrlr.c | 4 +++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
index 2c04323..73003d2 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
@@ -286,7 +286,7 @@
					psd.apw);
			}

			size_t tableSize = 32 * sizeof(uint64);
			uint32_t tableSize = 32 * sizeof(uint64);
			uint64* table = (uint64*)malloc(tableSize);
			memset(table, 0, tableSize);

diff --git a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme.h b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme.h
index 7c6959b..dbf5f2d 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme.h
+++ b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme.h
@@ -623,7 +623,7 @@
extern int nvme_ctrlr_set_feature(struct nvme_ctrlr *ctrlr,
				  bool save, enum nvme_feat feature,
				  uint32_t cdw11, uint32_t cdw12,
				  void *buf, size_t len,
				  void *buf, uint32_t len,
				  uint32_t *attributes);

/**
diff --git a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_ctrlr.c b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_ctrlr.c
index a0e0070..497a3eb 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_ctrlr.c
+++ b/src/add-ons/kernel/drivers/disk/nvme/libnvme/nvme_ctrlr.c
@@ -1193,7 +1193,7 @@
int nvme_ctrlr_set_feature(struct nvme_ctrlr *ctrlr,
			   bool save, enum nvme_feat feature,
			   uint32_t cdw11, uint32_t cdw12,
			   void *buf, size_t len,
			   void *buf, uint32_t len,
			   uint32_t *attributes)
{
	int ret;
@@ -1201,7 +1201,7 @@
	pthread_mutex_lock(&ctrlr->lock);

	ret = nvme_admin_set_feature(ctrlr, save, feature,
				     cdw11, cdw12, NULL, 0, attributes);
				     cdw11, cdw12, buf, len, attributes);
	if (ret != 0)
		nvme_notice("Set feature 0x%08x failed\n",
			    (unsigned int) feature);