projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
devtree.c
diff --git
a/arch/arm/kernel/devtree.c
b/arch/arm/kernel/devtree.c
index
a701e42
..
0cdd7b4
100644
(file)
--- a/
arch/arm/kernel/devtree.c
+++ b/
arch/arm/kernel/devtree.c
@@
-76,6
+76,9
@@
struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
unsigned long dt_root;
const char *model;
+ if (!dt_phys)
+ return NULL;
+
devtree = phys_to_virt(dt_phys);
/* check device tree validity */