projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: option: add id for Cellient MEN-200
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
of
/
fdt.c
diff --git
a/drivers/of/fdt.c
b/drivers/of/fdt.c
index 8b63a691a9ed2d8ec06cb1b137e301fa46f8050d..65200af29c5242644dcd0221e67bbe7b0ace99b2 100644
(file)
--- a/
drivers/of/fdt.c
+++ b/
drivers/of/fdt.c
@@
-670,7
+670,7
@@
int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
- if (depth != 1 ||
+ if (depth != 1 ||
!data ||
(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
return 0;
(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
return 0;
@@
-679,16
+679,16
@@
int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
/* Retrieve command line */
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
/* Retrieve command line */
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
- strlcpy(
cmd_line
, p, min((int)l, COMMAND_LINE_SIZE));
+ strlcpy(
data
, p, min((int)l, COMMAND_LINE_SIZE));
#ifdef CONFIG_CMDLINE
#ifndef CONFIG_CMDLINE_FORCE
if (p == NULL || l == 0 || (l == 1 && (*p) == 0))
#endif
#ifdef CONFIG_CMDLINE
#ifndef CONFIG_CMDLINE_FORCE
if (p == NULL || l == 0 || (l == 1 && (*p) == 0))
#endif
- strlcpy(
cmd_line
, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
+ strlcpy(
data
, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
#endif /* CONFIG_CMDLINE */
#endif /* CONFIG_CMDLINE */
- pr_debug("Command line is: %s\n",
cmd_line
);
+ pr_debug("Command line is: %s\n",
(char*)data
);
/* break now */
return 1;
/* break now */
return 1;