Skip to content

Commit 0a07b23

Browse files
committed
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
2 parents 286ba84 + 531da74 commit 0a07b23

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/of/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
476476
int i;
477477

478478
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)
480480
break;
481481

482482
return i;

scripts/dtc/dtx_diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ fi
321321
cpp_flags="\
322322
-nostdinc \
323323
-I${srctree}/arch/${ARCH}/boot/dts \
324-
-I${srctree}/arch/${ARCH}/boot/dts/include \
324+
-I${srctree}/scripts/dtc/include-prefixes \
325325
-I${srctree}/drivers/of/testcase-data \
326326
-undef -D__DTS__"
327327

0 commit comments

Comments
 (0)