projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[cascardo/linux.git]
/
drivers
/
pcmcia
/
cistpl.c
diff --git
a/drivers/pcmcia/cistpl.c
b/drivers/pcmcia/cistpl.c
index
9fcff0c
..
65129b5
100644
(file)
--- a/
drivers/pcmcia/cistpl.c
+++ b/
drivers/pcmcia/cistpl.c
@@
-1490,7
+1490,7
@@
int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
reserved++;
}
- if ((count) || (reserved > 5) ||
+ if ((count
== MAX_TUPLES
) || (reserved > 5) ||
((!dev_ok || !ident_ok) && (count > 10)))
count = 0;