2.4.x yenta.c

PATCH New Brad Campbell 1 participant 1 message Dec 30, 2003 Pcmcia

Share & tools

Brad Campbell

author

2003-12-30 13:58 UTC #0 lore raw

PATCH 1/1 2.4.x yenta.c

This fixes a longstanding bug on my OZ6933 Cardbus Controller (rev 01) (Having to insert a card twice to get it to come up)

I snarfed it from a 2.6-pre and applied it to 2.4. Could it be applied to 2.4.24 pretty please ?

drivers/pcmcia/yenta.c 2003-12-12 20:50:58.000000000 +0400 renamed from drivers/pcmcia/yenta.c 2003-12-30 21:08:09.000000000 +0400 +5 -0

diff -urN linux-2.4.23/drivers/pcmcia/yenta.c linux-2.4.23.olf/drivers/pcmcia/yenta.c
@@ -634,6 +634,7 @@
  */
 static void yenta_config_init(pci_socket_t *socket)
 {
+       u32 state;
        u16 bridge;
        struct pci_dev *dev = socket->dev;

@@ -673,6 +674,10 @@
        exca_writeb(socket, I365_GENCTL, 0x00);
 
        /* 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)))
+
        cb_writel(socket, CB_SOCKET_FORCE, CB_CVSTEST);
 }

Regards,
Brad