From: Tero Roponen I got the following output from 2.6.17-mm1: Jun 21 16:17:53 terrop kernel: pcmcia: registering new device pcmcia1.0 Jun 21 16:17:53 terrop kernel: xirc2ps_cs: Ooops: Not a creditcard Jun 21 16:17:53 terrop kernel: xirc2ps_cs: this card is not supported Jun 21 16:17:53 terrop kernel: xirc2ps_cs: unknown card (mediaid=c3 prodid=4d) The same card worked previously. If I revert this chunk, it works again. Cc: Dominik Brodowski Signed-off-by: Andrew Morton --- drivers/net/pcmcia/xirc2ps_cs.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) diff -puN drivers/net/pcmcia/xirc2ps_cs.c~git-pcmcia-xirc2ps_cs-fix-ooops-not-a-creditcard drivers/net/pcmcia/xirc2ps_cs.c --- 25/drivers/net/pcmcia/xirc2ps_cs.c~git-pcmcia-xirc2ps_cs-fix-ooops-not-a-creditcard Tue Jun 27 15:57:14 2006 +++ 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c Tue Jun 27 15:57:17 2006 @@ -743,7 +743,13 @@ xirc2ps_config(struct pcmcia_device * li tuple.TupleOffset = 0; /* Is this a valid card */ - switch(link->manf_id) { + tuple.DesiredTuple = CISTPL_MANFID; + if ((err=first_tuple(link, &tuple, &parse))) { + printk(KNOT_XIRC "manfid not found in CIS\n"); + goto failure; + } + + switch(parse.manfid.manf) { case MANFID_XIRCOM: local->manf_str = "Xircom"; break; _