diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e6ee34376c5ea6dda19a3aeeed7b94faa465ad41..2a84e140224467a9d7b7afa97b65b394d965d4d4 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1735,6 +1735,8 @@ static int nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,
 		if (ret)
 			dev_warn(ctrl->device,
 				 "Identify Descriptors failed (%d)\n", ret);
+		if (ret > 0)
+			ret = 0;
 	}
 	return ret;
 }