Commit 6a0141a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull Devicetree fix from Rob Herring:
 "A single build fix for powerpc due to device_node.type removal"

* tag 'devicetree-fixes-for-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  powerpc: chrp: Use of_node_is_type to access device_type
parents 26caabbc 75a080cd

arch/powerpc/platforms/chrp/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -538,8 +538,7 @@ static void __init chrp_init_IRQ(void) 
	/* see if there is a keyboard in the device tree

	   with a parent of type "adb" */

	for_each_node_by_name(kbd, "keyboard")

		if (kbd->parent && kbd->parent->type

		    && strcmp(kbd->parent->type, "adb") == 0)

		if (of_node_is_type(kbd->parent, "adb"))

			break;

	of_node_put(kbd);

	if (kbd)