diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 922036426c675d34bdbeaf05e42b3973cb83a92c..64f91e4a97fc8a94f240d3ca2c0e0dd828b67e52 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1608,6 +1608,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;
 }