Re: 2.4.25 yenta problem and small fix/workaround

[Daniel Ritz <daniel.ritz@gmx.ch>]

On Saturday 21 February 2004 13:28, Silla Rizzoli wrote:
> > the CB_CDETECT1 and CB_CDETECT2 bits both should be 0 for the card being
> > recognized correctly (and one of the voltage bits need to be set)
> >
> Nope, sorry, same behaviour. :(

either voltage interrogation is still not redone or one of CB_CDETECT1,CB_CDETECT2
is still set afterwards...

could you apply the attached patch (on top of my previous patch) and send the
output of dmesg?

thanx
-daniel


--- drivers/pcmcia/yenta.c~	2004-02-21 17:29:36.000000000 +0100
+++ drivers/pcmcia/yenta.c	2004-02-21 17:37:38.000000000 +0100
@@ -132,6 +132,7 @@
 {
 	unsigned int val;
 	u32 state = cb_readl(socket, CB_SOCKET_STATE);
+	printk(KERN_INFO "yenta_get_status: socket %p state %08x\n", socket, state);
 
 	val  = (state & CB_3VCARD) ? SS_3VCARD : 0;
 	val |= (state & CB_XVCARD) ? SS_XVCARD : 0;
@@ -677,8 +678,9 @@
 
 	/* Redo card voltage interrogation */
 	state = cb_readl(socket, CB_SOCKET_STATE);
+	printk(KERN_INFO "yenta_config_init socket %p state %08x\n", socket, state);
 	if (!(state & (CB_5VCARD | CB_3VCARD | CB_XVCARD | CB_YVCARD)) ||
-	    (state & (CB_CDETECT1 | CB_CDETECT2)))
+	    (state & (CB_CDETECT1 | CB_CDETECT2)) || (state & CB_NOTACARD))
 		cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);
 }