tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 0a07b238 286ba844

options
unified split
Changed files
+2 -2
drivers
of
irq.c
scripts
dtc
dtx_diff
+1 -1
drivers/of/irq.c
··· 476 476 int i; 477 477 478 478 for (i = 0; i < nr_irqs; i++, res++) 479 - if (!of_irq_to_resource(dev, i, res)) 479 + if (of_irq_to_resource(dev, i, res) <= 0) 480 480 break; 481 481 482 482 return i;
+1 -1
scripts/dtc/dtx_diff
··· 321 321 cpp_flags="\ 322 322 -nostdinc \ 323 323 -I${srctree}/arch/${ARCH}/boot/dts \ 324 - -I${srctree}/arch/${ARCH}/boot/dts/include \ 324 + -I${srctree}/scripts/dtc/include-prefixes \ 325 325 -I${srctree}/drivers/of/testcase-data \ 326 326 -undef -D__DTS__" 327 327