[BUG][PATCH][pcmcia] cisinfo_t removal prevents card detection

[Marc Zyngier]

Dominik,

The commit

c5081d5f4775b2a3f858f91151bbf9163e473075 (pcmcia: simplify pccard_validate_cis)

that entered mainline yesterday introduced a bug that prevents card detection
on my platform (PXA255 based), and possibly others :

  @@ -1490,11 +1491,13 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, cisinfo_
              ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
              reserved++;
       }
  -    if ((info->Chains == MAX_TUPLES) || (reserved > 5) ||
  -       ((!dev_ok || !ident_ok) && (info->Chains > 10)))
  -       info->Chains = 0;
  +    if ((count) || (reserved > 5) ||
  +       ((!dev_ok || !ident_ok) && (count > 10)))
  +       count = 0;

Since count starts at 1, condition is now always true, and count then
reset to 0. Restoring the comparaison to MAX_TUPLES makes everybody
happy...

	M.

Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxxxxx>

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;

--
A rat a day keeps the plague away.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/