3 files changed, 12 insertions, 12 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 7ef7adee5e4..9fc33984553 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -671,6 +671,7 @@ static void pcmcia_requery(struct pcmcia_socket *s)
                 if (old_funcs != new_funcs) {
                         /* we need to re-start */
                         pcmcia_card_remove(s, NULL);
+                        s->functions = 0;
                         pcmcia_card_add(s);
                 }
         }
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 1a648b90b63..25e5e30a18a 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1157,7 +1157,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
         unsigned int i, m, hwirq;
         pcmconf8xx_t *pcmcia;
         int status;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
 
         pcmcia_info("%s\n", version);
 
@@ -1301,7 +1301,7 @@ static struct of_platform_driver m8xx_pcmcia_driver = {
         .driver = {
                 .name = driver_name,
                 .owner = THIS_MODULE,
-                .match_table = m8xx_pcmcia_match,
+                .of_match_table = m8xx_pcmcia_match,
         },
         .probe = m8xx_probe,
         .remove = m8xx_remove,
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 424e576f3ac..f1d41374eea 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -880,6 +880,12 @@ static struct cardbus_type cardbus_type[] = {
                 .restore_state  = ti_restore_state,
                 .sock_init      = ti_init,
         },
+        [CARDBUS_TYPE_ENE]      = {
+                .override       = ene_override,
+                .save_state     = ti_save_state,
+                .restore_state  = ti_restore_state,
+                .sock_init      = ti_init,
+        },
 #endif
 #ifdef CONFIG_YENTA_RICOH
         [CARDBUS_TYPE_RICOH]    = {
@@ -902,14 +908,6 @@ static struct cardbus_type cardbus_type[] = {
                 .restore_state  = o2micro_restore_state,
         },
 #endif
-#ifdef CONFIG_YENTA_TI
-        [CARDBUS_TYPE_ENE]      = {
-                .override       = ene_override,
-                .save_state     = ti_save_state,
-                .restore_state  = ti_restore_state,
-                .sock_init      = ti_init,
-        },
-#endif
 };
 
 
@@ -975,7 +973,7 @@ static irqreturn_t yenta_probe_handler(int irq, void *dev_id)
 /* probes the PCI interrupt, use only on override functions */
 static int yenta_probe_cb_irq(struct yenta_socket *socket)
 {
-        u8 reg;
+        u8 reg = 0;
 
         if (!socket->cb_irq)
                 return -1;
@@ -989,7 +987,8 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket)
         }
 
         /* generate interrupt, wait */
-        reg = exca_readb(socket, I365_CSCINT);
+        if (!socket->dev->irq)
+                reg = exca_readb(socket, I365_CSCINT);
         exca_writeb(socket, I365_CSCINT, reg | I365_CSC_STSCHG);
         cb_writel(socket, CB_SOCKET_EVENT, -1);
         cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);