diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 6d045bf22a5123c92dd063a6244139ec84ec09a9..2b426f63427bc4af019d79683283b1a63209d4b5 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1004,7 +1004,7 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid,
 		  * Don't treat an error as fatal, as we potentially already
 		  * have a NGUID or EUI-64.
 		  */
-		if (status > 0)
+		if (status > 0 && !(status & NVME_SC_DNR))
 			status = 0;
 		goto free_data;
 	}