diff options
Diffstat (limited to 'drivers/net/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index a7662f0832eb..e3a85ce89880 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -869,7 +869,6 @@ xirc2ps_config(struct pcmcia_device * link) | |||
869 | goto config_error; | 869 | goto config_error; |
870 | 870 | ||
871 | if (local->dingo) { | 871 | if (local->dingo) { |
872 | conf_reg_t reg; | ||
873 | win_req_t req; | 872 | win_req_t req; |
874 | memreq_t mem; | 873 | memreq_t mem; |
875 | 874 | ||
@@ -878,15 +877,14 @@ xirc2ps_config(struct pcmcia_device * link) | |||
878 | * the base address of the ethernet port (BasePort1) is written | 877 | * the base address of the ethernet port (BasePort1) is written |
879 | * to the BAR registers of the modem. | 878 | * to the BAR registers of the modem. |
880 | */ | 879 | */ |
881 | reg.Action = CS_WRITE; | 880 | err = pcmcia_write_config_byte(link, CISREG_IOBASE_0, |
882 | reg.Offset = CISREG_IOBASE_0; | 881 | link->io.BasePort2 & 0xff); |
883 | reg.Value = link->io.BasePort2 & 0xff; | 882 | if (err) |
884 | if ((err = pcmcia_access_configuration_register(link, ®))) | ||
885 | goto config_error; | 883 | goto config_error; |
886 | reg.Action = CS_WRITE; | 884 | |
887 | reg.Offset = CISREG_IOBASE_1; | 885 | err = pcmcia_write_config_byte(link, CISREG_IOBASE_1, |
888 | reg.Value = (link->io.BasePort2 >> 8) & 0xff; | 886 | (link->io.BasePort2 >> 8) & 0xff); |
889 | if ((err = pcmcia_access_configuration_register(link, ®))) | 887 | if (err) |
890 | goto config_error; | 888 | goto config_error; |
891 | 889 | ||
892 | /* There is no config entry for the Ethernet part which | 890 | /* There is no config entry for the Ethernet part which |