diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 19:55:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 19:55:07 +0200 |
| commit | f39548a6ad1dbdfaab552419386ec5bb1d76fa0d (patch) | |
| tree | c8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49 /drivers/pcmcia | |
| parent | Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | pcmcia: ide-cs: Remove outdated comment (diff) | |
| download | linux-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.tar.xz linux-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
pcmcia: ide-cs: Remove outdated comment
pcmcia: fix cisinfo_t removal
pcmcia: fix return value in cm4000_cs.c
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/cistpl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 9fcff0c33619..65129b54eb09 100644 --- 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; |