diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 12:31:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 12:31:56 -0500 |
| commit | f8dacde8c0f7841ad91fbaba43fb0ebf1c2c80b7 (patch) | |
| tree | f406bf66a59a1a1a16aab8581b9c8ede1b177540 /arch | |
| 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()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/kernel/chmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 3b9f4d6e14a9..e1a9598e2a4d 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c | |||
| @@ -306,6 +306,7 @@ static int jbusmc_print_dimm(int syndrome_code, | |||
| 306 | buf[1] = '?'; | 306 | buf[1] = '?'; |
| 307 | buf[2] = '?'; | 307 | buf[2] = '?'; |
| 308 | buf[3] = '\0'; | 308 | buf[3] = '\0'; |
| 309 | return 0; | ||
| 309 | } | 310 | } |
| 310 | p = dp->controller; | 311 | p = dp->controller; |
| 311 | prop = &p->layout; | 312 | prop = &p->layout; |