aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-08-13 14:33:34 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 19:55:26 -0400
commit4914c7f881845367b9198631a014ab466329b9e5 (patch)
tree32a4691b88960a0773b9acfe2a63b776257c25e4 /drivers/net
parentfe622e76fddd986e56f22842a6ce292504727ef1 (diff)
pcmcia: xirc2ps_cs bugfix
We need to set io_lines to 10 unconditionally. Reported-by: Komuro <komurojun-mbn@nifty.com> CC: netdev@vger.kernel.org Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 4eb6f986703b..f5819526b5ee 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -808,6 +808,7 @@ xirc2ps_config(struct pcmcia_device * link)
808 } 808 }
809 809
810 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16; 810 link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
811 link->io_lines = 10;
811 if (local->modem) { 812 if (local->modem) {
812 int pass; 813 int pass;
813 814
@@ -839,7 +840,6 @@ xirc2ps_config(struct pcmcia_device * link)
839 } 840 }
840 printk(KNOT_XIRC "no ports available\n"); 841 printk(KNOT_XIRC "no ports available\n");
841 } else { 842 } else {
842 link->io_lines = 10;
843 link->resource[0]->end = 16; 843 link->resource[0]->end = 16;
844 for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) { 844 for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
845 link->resource[0]->start = ioaddr; 845 link->resource[0]->start = ioaddr;