diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 18:28:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 18:28:46 -0700 |
| commit | f26a3988917913b3d11b2bd741601a2c64ab9204 (patch) | |
| tree | 69b3da12c23ebe30a4ed0563648eb1bca5e83185 /drivers | |
| parent | ac0e9c30b1cb22c01f3edbb94857de2bae7611ca (diff) | |
| parent | faa5b9daa8bd8a18b5b1f3a8dd79261503f7cdd3 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpctip-x86-urgent-2008-05-17-17-16-08tip-x86-setup-2008-05-30_12.10_Fritip-x86-mtrr-2008-05-16-12-09-30tip-x86-cleanups-2008-05-16-11-16-08tip-tip-2008-05-26_08_52_Montip-timers-hrtimers-2008-05-30_12.09_Fritip-timers-hpet-2008-05-30_12.09_Fritip-sched-2008-05-26_08_52_Montip-core-locking-2008-05-26_08_52_Mon
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] macintosh: Replace deprecated __initcall with device_initcall
[POWERPC] cell: Fix section mismatches in io-workarounds code
[POWERPC] spufs: Fix compile error
[POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
[POWERPC] Add null pointer check to of_find_property
[POWERPC] vmemmap fixes to use smaller pages
[POWERPC] spufs: Fix pointer reference in find_victim
[POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting
[POWERPC] 85xx: Fix some sparse warnings for 85xx MDS
[POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.
[POWERPC] 86xx: mpc8610_hpcd: fix second serial port
[POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
[POWERPC] 85xx: Add 8568 PHY workarounds to board code
[POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/adb.c | 2 | ||||
| -rw-r--r-- | drivers/of/base.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index b8b9e44f7f4e..dbaad39020a1 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c @@ -334,7 +334,7 @@ int __init adb_init(void) return 0; } -__initcall(adb_init); +device_initcall(adb_init); static int do_adb_reset_bus(void) diff --git a/drivers/of/base.c b/drivers/of/base.c index 9bd7c4a31253..23ffb7c0caf2 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -65,6 +65,9 @@ struct property *of_find_property(const struct device_node *np, { struct property *pp; + if (!np) + return NULL; + read_lock(&devtree_lock); for (pp = np->properties; pp != 0; pp = pp->next) { if (of_prop_cmp(pp->name, name) == 0) { |