The patch titled
git-pcicma: xirc2ps_cs: fix "Ooops: Not a creditcard"
has been removed from the -mm tree. Its filename is
git-pcmcia-xirc2ps_cs-fix-ooops-not-a-creditcard.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: git-pcicma: xirc2ps_cs: fix "Ooops: Not a creditcard"
From: Tero Roponen <teanropo@xxxxxxxxx>
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 <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/pcmcia/xirc2ps_cs.c | 8 +++++++-
1 file 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
--- a/drivers/net/pcmcia/xirc2ps_cs.c~git-pcmcia-xirc2ps_cs-fix-ooops-not-a-creditcard
+++ a/drivers/net/pcmcia/xirc2ps_cs.c
@@ -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;
_
Patches currently in -mm which might be from teanropo@xxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
