diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 09:31:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 09:31:56 -0800 |
| commit | f8dacde8c0f7841ad91fbaba43fb0ebf1c2c80b7 (patch) | |
| tree | f406bf66a59a1a1a16aab8581b9c8ede1b177540 | |
| parent | Merge git://git.infradead.org/iommu-2.6 (diff) | |
| parent | sparc64: Fix crashes in jbusmc_print_dimm() (diff) | |
| download | wireguard-linux-f8dacde8c0f7841ad91fbaba43fb0ebf1c2c80b7.tar.xz wireguard-linux-f8dacde8c0f7841ad91fbaba43fb0ebf1c2c80b7.zip | |
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()
| -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, buf[1] = '?'; buf[2] = '?'; buf[3] = '\0'; + return 0; } p = dp->controller; prop = &p->layout; |