Problem with TI1250 rev 02 on Thinkpad 560Z

[Daniel Ritz]

does this one make a difference?
against 2.6.6-rc1, but should apply just fine to older kernels.

rgds
-daniel



--- 1.54/drivers/pcmcia/yenta_socket.c	Wed Apr 14 23:06:58 2004
+++ edited/drivers/pcmcia/yenta_socket.c	Sat Apr 17 00:07:51 2004
@@ -477,8 +477,8 @@
 
 	/* Redo card voltage interrogation */
 	state = cb_readl(socket, CB_SOCKET_STATE);
-	if (!(state & (CB_CDETECT1 | CB_CDETECT2 | CB_5VCARD |
-	               CB_3VCARD | CB_XVCARD | CB_YVCARD)))
+	if (!(state & (CB_5VCARD | CB_3VCARD | CB_XVCARD | CB_YVCARD)) ||
+	    (state & (CB_CDETECT1 | CB_CDETECT2)))
 		cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);
 
 	yenta_clear_maps(socket);