Merge amd-staging into amd-master 20230803

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com> Change-Id: I7d0428dc3b5dae6fbd32e414a8aaedc64fb88d44
2023-08-03 14:40:50 +08:00
parent c4bc5550f7 0522439ac2
commit 54685546ed
1 changed files with 1 additions and 2 deletions
@@ -682,6 +682,7 @@ rsmi_dev_ecc_count_get(uint32_t dv_ind, rsmi_gpu_block_t block,
  DEVICE_MUTEX

  ret = GetDevValueVec(type, dv_ind, &val_vec);
+  if (val_vec.size() != 2 ) ret = RSMI_STATUS_FILE_ERROR;

  if (ret == RSMI_STATUS_FILE_ERROR) {
    ss << __PRETTY_FUNCTION__ << " | ======= end ======="
@@ -698,8 +699,6 @@ rsmi_dev_ecc_count_get(uint32_t dv_ind, rsmi_gpu_block_t block,
    return ret;
  }

-  assert(val_vec.size() == 2);
-
  std::string junk;
  std::istringstream fs1(val_vec[0]);