diff options
Diffstat (limited to 'drivers/net/wireless/wl3501_cs.c')
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index a32f220648c0..a1cc2d498a1c 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1884,9 +1884,8 @@ static int wl3501_probe(struct pcmcia_device *p_dev) | |||
1884 | struct wl3501_card *this; | 1884 | struct wl3501_card *this; |
1885 | 1885 | ||
1886 | /* The io structure describes IO port mapping */ | 1886 | /* The io structure describes IO port mapping */ |
1887 | p_dev->io.NumPorts1 = 16; | 1887 | p_dev->resource[0]->end = 16; |
1888 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 1888 | p_dev->resource[0]->flags = IO_DATA_PATH_WIDTH_8; |
1889 | p_dev->io.IOAddrLines = 5; | ||
1890 | 1889 | ||
1891 | /* General socket configuration */ | 1890 | /* General socket configuration */ |
1892 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 1891 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
@@ -1932,13 +1931,14 @@ static int wl3501_config(struct pcmcia_device *link) | |||
1932 | /* Try allocating IO ports. This tries a few fixed addresses. If you | 1931 | /* Try allocating IO ports. This tries a few fixed addresses. If you |
1933 | * want, you can also read the card's config table to pick addresses -- | 1932 | * want, you can also read the card's config table to pick addresses -- |
1934 | * see the serial driver for an example. */ | 1933 | * see the serial driver for an example. */ |
1934 | link->io_lines = 5; | ||
1935 | 1935 | ||
1936 | for (j = 0x280; j < 0x400; j += 0x20) { | 1936 | for (j = 0x280; j < 0x400; j += 0x20) { |
1937 | /* The '^0x300' is so that we probe 0x300-0x3ff first, then | 1937 | /* The '^0x300' is so that we probe 0x300-0x3ff first, then |
1938 | * 0x200-0x2ff, and so on, because this seems safer */ | 1938 | * 0x200-0x2ff, and so on, because this seems safer */ |
1939 | link->io.BasePort1 = j; | 1939 | link->resource[0]->start = j; |
1940 | link->io.BasePort2 = link->io.BasePort1 + 0x10; | 1940 | link->resource[1]->start = link->resource[0]->start + 0x10; |
1941 | i = pcmcia_request_io(link, &link->io); | 1941 | i = pcmcia_request_io(link); |
1942 | if (i == 0) | 1942 | if (i == 0) |
1943 | break; | 1943 | break; |
1944 | } | 1944 | } |