Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6

[~andy/linux] / drivers / telephony / ixj_pcmcia.c

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index ba2c7a2125a06461d82478dfaf8a6315e6f173f3..347c3ed1d9f15fbe1edd10944b6b44b72ace07ac 100644 (file)
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -126,10 +126,10 @@ static void ixj_get_serial(struct pcmcia_device * link, IXJ * j)
 
 static int ixj_config_check(struct pcmcia_device *p_dev,
                            cistpl_cftable_entry_t *cfg,
+                           cistpl_cftable_entry_t *dflt,
+                           unsigned int vcc,
                            void *priv_data)
 {
-       cistpl_cftable_entry_t *dflt = priv_data;
-
        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
                p_dev->io.BasePort1 = io->win[0].base;
@@ -138,10 +138,7 @@ static int ixj_config_check(struct pcmcia_device *p_dev,
                        p_dev->io.BasePort2 = io->win[1].base;
                        p_dev->io.NumPorts2 = io->win[1].len;
                }
-               if (pcmcia_request_io(p_dev, &p_dev->io)) {
-                       if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
-                               *dflt = *cfg;
-               } else
+               if (!pcmcia_request_io(p_dev, &p_dev->io))
                        return 0;
        }
        return -ENODEV;