diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-19 15:03:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-19 15:03:24 -0700 |
| commit | 1fbbed4137de93e02fc62776b8bf08a2d9ae1141 (patch) | |
| tree | 1a50291637d723e1a49eed91d5d15d22452750c4 /scripts/dtc | |
| parent | f538a82c075ba3d31e7691a361f28795eff0a786 (diff) | |
| parent | 49e67dd17649b60b4d54966e18ec9c80198227f0 (diff) | |
Merge tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- fix missing allocation failure handling in fdt code
- fix dtc compile error on 32-bit hosts
- revert bad sparse changes causing GCC7 warnings
* tag 'devicetree-fixes-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: fdt: add missing allocation-failure check
dtc: check.c fix compile error
Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code"
Diffstat (limited to 'scripts/dtc')
| -rw-r--r-- | scripts/dtc/checks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c index 5adfc8f52b4f..4b72b530c84f 100644 --- a/scripts/dtc/checks.c +++ b/scripts/dtc/checks.c @@ -873,7 +873,7 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no while (size--) reg = (reg << 32) | fdt32_to_cpu(*(cells++)); - snprintf(unit_addr, sizeof(unit_addr), "%lx", reg); + snprintf(unit_addr, sizeof(unit_addr), "%zx", reg); if (!streq(unitname, unit_addr)) FAIL(c, dti, "Node %s simple-bus unit address format error, expected \"%s\"", node->fullpath, unit_addr); |