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 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git]
/
drivers
/
parisc
/
pdc_stable.c
diff --git
a/drivers/parisc/pdc_stable.c
b/drivers/parisc/pdc_stable.c
index
f9f9a5f
..
13a64bc
100644
(file)
--- a/
drivers/parisc/pdc_stable.c
+++ b/
drivers/parisc/pdc_stable.c
@@
-370,7
+370,7
@@
pdcspath_layer_read(struct pdcspath_entry *entry, char *buf)
if (!i) /* entry is not ready */
return -ENODATA;
- for (i = 0;
devpath->layers[i] && (likely(i < 6))
; i++)
+ for (i = 0;
i < 6 && devpath->layers[i]
; i++)
out += sprintf(out, "%u ", devpath->layers[i]);
out += sprintf(out, "\n");