git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
char
/
cyclades.c
diff --git
a/drivers/char/cyclades.c
b/drivers/char/cyclades.c
index df5038bbcbc28647cc64eed72f0fee6fbc8c2568..4254457d391186429590769d05334d01c459bd75 100644
(file)
--- a/
drivers/char/cyclades.c
+++ b/
drivers/char/cyclades.c
@@
-3354,7
+3354,7
@@
static int __init cy_detect_isa(void)
continue;
}
#ifdef MODULE
- if (isparam && irq[i])
+ if (isparam && i
< NR_CARDS && i
rq[i])
cy_isa_irq = irq[i];
else
#endif