2.6.17-mm1: Ooops: Not a creditcard

[Tero Roponen]

Hi,

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:

--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -754,13 +754,7 @@ xirc2ps_config(struct pcmcia_device * li
     tuple.TupleOffset = 0;

     /* Is this a valid	card */
-    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) {
+    switch(link->manf_id) {
       case MANFID_XIRCOM:
 	local->manf_str = "Xircom";
 	break;

I guess the problem is that 'buf' is not properly initialized when
we come here, as nothing touches it before this:

	if (!set_card_type(link, buf)) {
		printk(KNOT_XIRC "this card is not supported\n");
		goto failure;
	}

I don't know what the proper fix is.

-
Tero Roponen