Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 972d17c9 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Check for the root node in of_detach_node() 



It's not sensible to call of_detach_node() on the root node,
but we should check for it just to be safe.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 333e6154

arch/powerpc/kernel/prom.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1432,6 +1432,8 @@ void of_detach_node(const struct device_node *np) 
	write_lock(&devtree_lock);

	write_lock(&devtree_lock);





	parent = np->parent;

	parent = np->parent;

	if (!parent)

		goto out_unlock;





	if (allnodes == np)

	if (allnodes == np)

		allnodes = np->allnext;

		allnodes = np->allnext;
@@ -1455,6 +1457,7 @@ void of_detach_node(const struct device_node *np) 
		prevsib->sibling = np->sibling;

		prevsib->sibling = np->sibling;

	}

	}





out_unlock:

	write_unlock(&devtree_lock);

	write_unlock(&devtree_lock);

}

}