aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia/cm4000_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/pcmcia/cm4000_cs.c')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 870decbdf7ca..c996ae1375be 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1765,7 +1765,6 @@ static void cm4000_config(dev_link_t * link, int devno)
1765 struct cm4000_dev *dev; 1765 struct cm4000_dev *dev;
1766 tuple_t tuple; 1766 tuple_t tuple;
1767 cisparse_t parse; 1767 cisparse_t parse;
1768 config_info_t conf;
1769 u_char buf[64]; 1768 u_char buf[64];
1770 int fail_fn, fail_rc; 1769 int fail_fn, fail_rc;
1771 int rc; 1770 int rc;
@@ -1790,16 +1789,10 @@ static void cm4000_config(dev_link_t * link, int devno)
1790 fail_fn = ParseTuple; 1789 fail_fn = ParseTuple;
1791 goto cs_failed; 1790 goto cs_failed;
1792 } 1791 }
1793 if ((fail_rc =
1794 pcmcia_get_configuration_info(handle, &conf)) != CS_SUCCESS) {
1795 fail_fn = GetConfigurationInfo;
1796 goto cs_failed;
1797 }
1798 1792
1799 link->state |= DEV_CONFIG; 1793 link->state |= DEV_CONFIG;
1800 link->conf.ConfigBase = parse.config.base; 1794 link->conf.ConfigBase = parse.config.base;
1801 link->conf.Present = parse.config.rmask[0]; 1795 link->conf.Present = parse.config.rmask[0];
1802 link->conf.Vcc = conf.Vcc;
1803 1796
1804 link->io.BasePort2 = 0; 1797 link->io.BasePort2 = 0;
1805 link->io.NumPorts2 = 0; 1798 link->io.NumPorts2 = 0;