git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
rtasd.c
diff --git
a/arch/powerpc/kernel/rtasd.c
b/arch/powerpc/kernel/rtasd.c
index
0438f81
..
049dbec
100644
(file)
--- a/
arch/powerpc/kernel/rtasd.c
+++ b/
arch/powerpc/kernel/rtasd.c
@@
-160,7
+160,7
@@
static int log_rtas_len(char * buf)
/* rtas fixed header */
len = 8;
err = (struct rtas_error_log *)buf;
/* rtas fixed header */
len = 8;
err = (struct rtas_error_log *)buf;
- if (err->extended_log_length) {
+ if (err->extended
&& err->extended
_log_length) {
/* extended header */
len += err->extended_log_length;
/* extended header */
len += err->extended_log_length;