Commit 002b90a1 authored Jul 15, 2008 by Marc Zyngier Committed by Dominik Brodowski Jul 15, 2008

pcmcia: fix cisinfo_t removal



The cisinfo_t removal patch (c5081d5f
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>

parent d93c768e

drivers/pcmcia/cistpl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message