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

Commit 0a07b238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull DeviceTree fixes from Rob Herring:
 "Two small DT fixes:

   - Fix error handling in of_irq_to_resource_table() due to
     of_irq_to_resource() error return changes.

   - Fix dtx_diff script due to dts include path changes"

* tag 'devicetree-fixes-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  of: irq: fix of_irq_to_resource() error check
  scripts/dtc: dtx_diff - update include dts paths to match build
parents 286ba844 531da740

drivers/of/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res, 
	int i;



	for (i = 0; i < nr_irqs; i++, res++)

		if (!of_irq_to_resource(dev, i, res))

		if (of_irq_to_resource(dev, i, res) <= 0)

			break;



	return i;

scripts/dtc/dtx_diff

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ fi 
cpp_flags="\

	-nostdinc                                  \

	-I${srctree}/arch/${ARCH}/boot/dts         \

	-I${srctree}/arch/${ARCH}/boot/dts/include \

	-I${srctree}/scripts/dtc/include-prefixes  \

	-I${srctree}/drivers/of/testcase-data      \

	-undef -D__DTS__"