summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <maz@misterjones.org>2008-07-15 15:26:15 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2008-07-15 20:53:06 +0200
commit002b90a1bf5fe9c8de7a8634403a685621841ff3 (patch)
treeeb0526d8a3f88ed1a2f7c202e833c5ad870e977b
parentd93c768e66d8c3970187c179a91a2553b077d9e8 (diff)
downloadop-kernel-dev-002b90a1bf5fe9c8de7a8634403a685621841ff3.zip
op-kernel-dev-002b90a1bf5fe9c8de7a8634403a685621841ff3.tar.gz
pcmcia: fix cisinfo_t removal
The cisinfo_t removal patch (c5081d5f4775b2a3f858f91151bbf9163e473075 pcmcia: simplify pccard_validate_cis ) introduced a bug that prevented card detection, for the (info->Chains == MAX_TUPLES) check was replaced by (count), which is always true. Restoring the comparison to MAX_TUPLES makes everybody happy... [linux@dominikbrodowski.net: update changelog comment] Signed-off-by: Marc Zyngier <marc.zyngier@altran.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-rw-r--r--drivers/pcmcia/cistpl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
index 9fcff0c..65129b5 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;
OpenPOWER on IntegriCloud