Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'devicetree-fixes-for-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree fixes from Rob Herring:
- Fix memory leak in error case of of_console_check
- Increase number of reserved memory regions to 32. 16 was not enough
on some Power systems.
- Fix OF node refcounting for of_fwnode_graph_get_port_parent
* tag 'devicetree-fixes-for-4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
device property: preserve usecount for node passed to of_fwnode_graph_get_port_parent()
drivers: of: increase MAX_RESERVED_REGIONS to 32
of: do not leak console options
+8
-4
+6
-2
drivers/of/base.c
+6
-2
drivers/of/base.c
···
1781
1781
{
1782
1782
if (!dn || dn != of_stdout || console_set_on_cmdline)
1783
1783
return false;
1784
-
return !add_preferred_console(name, index,
1785
-
kstrdup(of_stdout_options, GFP_KERNEL));
1784
+
1785
+
/*
1786
+
* XXX: cast `options' to char pointer to suppress complication
1787
+
* warnings: printk, UART and console drivers expect char pointer.
1788
+
*/
1789
+
return !add_preferred_console(name, index, (char *)of_stdout_options);
1786
1790
}
1787
1791
EXPORT_SYMBOL_GPL(of_console_check);
1788
1792
+1
-1
drivers/of/of_reserved_mem.c
+1
-1
drivers/of/of_reserved_mem.c