md: revert incorrect fix for read error handling in raid1.

[safe/jmp/linux-2.6] / drivers / telephony / ixj_pcmcia.c

diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/telephony/ixj_pcmcia.c
index 89c5e40..347c3ed 100644 (file)
--- a/drivers/telephony/ixj_pcmcia.c
+++ b/drivers/telephony/ixj_pcmcia.c
@@ -126,23 +126,19 @@ 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->conf.ConfigIndex = cfg->index;
                p_dev->io.BasePort1 = io->win[0].base;
                p_dev->io.NumPorts1 = io->win[0].len;
                if (io->nwin == 2) {
                        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;