brcm2708: fix build error introduced in 2b4e5d47

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
owl
Álvaro Fernández Rojas 2016-06-01 17:08:08 +02:00
parent 83390271f9
commit 65ae9db41a
1 changed files with 1 additions and 4 deletions

View File

@ -9,15 +9,12 @@ Subject: [PATCH 050/304] fdt: Add support for the CONFIG_CMDLINE_EXTEND option
--- a/drivers/of/fdt.c --- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c +++ b/drivers/of/fdt.c
@@ -954,22 +954,38 @@ int __init early_init_dt_scan_chosen(uns @@ -954,19 +954,38 @@ int __init early_init_dt_scan_chosen(uns
/* Retrieve command line */ /* Retrieve command line */
p = of_get_flat_dt_prop(node, "bootargs", &l); p = of_get_flat_dt_prop(node, "bootargs", &l);
- if (p != NULL && l > 0) - if (p != NULL && l > 0)
- strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE)); - strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
- p = of_get_flat_dt_prop(node, "bootargs-append", &l);
- if (p != NULL && l > 0)
- strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
/* /*
* CONFIG_CMDLINE is meant to be a default in case nothing else * CONFIG_CMDLINE is meant to be a default in case nothing else