git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[pandora-kernel.git]
/
arch
/
mips
/
pmc-sierra
/
yosemite
/
prom.c
diff --git
a/arch/mips/pmc-sierra/yosemite/prom.c
b/arch/mips/pmc-sierra/yosemite/prom.c
index
cf4c868
..
dcc926e
100644
(file)
--- a/
arch/mips/pmc-sierra/yosemite/prom.c
+++ b/
arch/mips/pmc-sierra/yosemite/prom.c
@@
-102,7
+102,7
@@
void __init prom_init(void)
/* Get the boot parameters */
for (i = 1; i < argc; i++) {
- if (strlen(arcs_cmdline) + strlen(arg[i]
+ 1)
>=
+ if (strlen(arcs_cmdline) + strlen(arg[i]
) + 1
>=
sizeof(arcs_cmdline))
break;