]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
pcmcia: xirc2ps_cs bugfix
authorDominik Brodowski <linux@dominikbrodowski.net>
Fri, 13 Aug 2010 18:33:34 +0000 (20:33 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 23:55:26 +0000 (16:55 -0700)
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>
drivers/net/pcmcia/xirc2ps_cs.c

index 4eb6f986703bec69686b8def0677535a760aac61..f5819526b5ee90c25a8630a63fc81f04b64ffb0e 100644 (file)
@@ -808,6 +808,7 @@ xirc2ps_config(struct pcmcia_device * link)
     }
 
     link->resource[0]->flags |= IO_DATA_PATH_WIDTH_16;
+    link->io_lines = 10;
     if (local->modem) {
        int pass;
 
@@ -839,7 +840,6 @@ xirc2ps_config(struct pcmcia_device * link)
        }
        printk(KNOT_XIRC "no ports available\n");
     } else {
-       link->io_lines = 10;
        link->resource[0]->end = 16;
        for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
            link->resource[0]->start = ioaddr;