diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 09:53:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 09:53:40 -0700 |
| commit | 2423e142b37e2fcce61ea6d3c2f103384ae05f92 (patch) | |
| tree | 1cc152f4f85ef35ac973e277db16dec17db22585 /drivers | |
| parent | 322a3b843d7f475b857646ed8f95b40431d3ecd0 (diff) | |
| parent | 6799e3f281e962628be531e8331bacd05b866134 (diff) | |
Merge tag 'devicetree-fixes-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Several Renesas binding fixes to fix warnings
- Remove duplicate compatibles in 8250 binding
- Remove orphaned Sigma Designs Tango bindings
- Fix bcm2711-hdmi binding to use 'additionalProperties'
- Fix idt,32434-pic warning for missing 'interrupts' property
- Fix 'stored but not read' warnings in DT overlay code
* tag 'devicetree-fixes-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: net: renesas,etheravb: Fix optional second clock name
dt-bindings: display: renesas,du: Add missing power-domains property
dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1
dt-bindings: PCI: rcar-pci-host: Document missing R-Car H1 support
of: overlay: Remove redundant assignment to ret
dt-bindings: serial: 8250: Remove duplicated compatible strings
dt-bindings: Remove unused Sigma Designs Tango bindings
dt-bindings: bcm2711-hdmi: Fix broken schema
dt-bindings: interrupt-controller: idt,32434-pic: Add missing interrupts property
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/overlay.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 180c6fb3ef36..d80160cf34bb 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -1024,7 +1024,6 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size, struct device_node *overlay_root = NULL; *ovcs_id = 0; - ret = 0; if (overlay_fdt_size < sizeof(struct fdt_header) || fdt_check_header(overlay_fdt)) { @@ -1195,8 +1194,6 @@ int of_overlay_remove(int *ovcs_id) struct overlay_changeset *ovcs; int ret, ret_apply, ret_tmp; - ret = 0; - if (devicetree_corrupt()) { pr_err("suspect devicetree state, refuse to remove overlay\n"); ret = -EBUSY; |