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/pcm-estrpipe-in-pm' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
tokenring
/
ibmtr.c
diff --git
a/drivers/net/tokenring/ibmtr.c
b/drivers/net/tokenring/ibmtr.c
index
9d89611
..
08a6c41
100644
(file)
--- a/
drivers/net/tokenring/ibmtr.c
+++ b/
drivers/net/tokenring/ibmtr.c
@@
-1912,7
+1912,7
@@
static int __init ibmtr_init(void)
find_turbo_adapters(io);
- for (i = 0; i
o[i] && (i < IBMTR_MAX_ADAPTERS)
; i++) {
+ for (i = 0; i
< IBMTR_MAX_ADAPTERS && io[i]
; i++) {
struct net_device *dev;
irq[i] = 0;
mem[i] = 0;