Kaynağa Gözat

core: ofnode: do not assert if node not valid in ofnode_get_name()

In some case with LIVE DT, some node always not valid, or not have
a valid name, eg. blk driver add by mmc.
Return fail instead of Assert for this kind of ofnode, and this
help with assert happen from time to time when of_live is enabled
and DEBUG is enabled.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Kever Yang 4 yıl önce
ebeveyn
işleme
8f0a70e816
1 değiştirilmiş dosya ile 5 ekleme ve 1 silme
  1. 5 1
      drivers/core/ofnode.c

+ 5 - 1
drivers/core/ofnode.c

@@ -212,7 +212,11 @@ ofnode ofnode_get_parent(ofnode node)
 
 const char *ofnode_get_name(ofnode node)
 {
-	assert(ofnode_valid(node));
+	if (!ofnode_valid(node)) {
+		debug("%s node not valid\n", __func__);
+		return NULL;
+	}
+
 	if (ofnode_is_np(node))
 		return strrchr(node.np->full_name, '/') + 1;