| commit | f8dacde8c0f7841ad91fbaba43fb0ebf1c2c80b7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 25 09:31:56 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 25 09:31:56 2009 -0800 |
| tree | f406bf66a59a1a1a16aab8581b9c8ede1b177540 | |
| parent | 60042600c57be5737cd9d6869e7144f7fe786274 [diff] | |
| parent | 1b0e235cc9bfae4bc0f5cd0cba929206fb0f6a64 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix crashes in jbusmc_print_dimm()
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 3b9f4d6..e1a9598 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c
@@ -306,6 +306,7 @@ buf[1] = '?'; buf[2] = '?'; buf[3] = '\0'; + return 0; } p = dp->controller; prop = &p->layout;