diff options
Diffstat (limited to 'drivers/isdn/hardware/avm')
-rw-r--r-- | drivers/isdn/hardware/avm/avm_cs.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index 7c8c51f22003..09b1795516f4 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c | |||
@@ -75,9 +75,8 @@ static int avmcs_probe(struct pcmcia_device *p_dev) | |||
75 | { | 75 | { |
76 | 76 | ||
77 | /* The io structure describes IO port mapping */ | 77 | /* The io structure describes IO port mapping */ |
78 | p_dev->io.NumPorts1 = 16; | 78 | p_dev->resource[0]->end = 16; |
79 | p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; | 79 | p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8; |
80 | p_dev->io.NumPorts2 = 0; | ||
81 | 80 | ||
82 | /* General socket configuration */ | 81 | /* General socket configuration */ |
83 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 82 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
@@ -119,13 +118,9 @@ static int avmcs_configcheck(struct pcmcia_device *p_dev, | |||
119 | if (cf->io.nwin <= 0) | 118 | if (cf->io.nwin <= 0) |
120 | return -ENODEV; | 119 | return -ENODEV; |
121 | 120 | ||
122 | p_dev->io.BasePort1 = cf->io.win[0].base; | 121 | p_dev->resource[0]->start = cf->io.win[0].base; |
123 | p_dev->io.NumPorts1 = cf->io.win[0].len; | 122 | p_dev->resource[0]->end = cf->io.win[0].len; |
124 | p_dev->io.NumPorts2 = 0; | 123 | return pcmcia_request_io(p_dev); |
125 | printk(KERN_INFO "avm_cs: testing i/o %#x-%#x\n", | ||
126 | p_dev->io.BasePort1, | ||
127 | p_dev->io.BasePort1+p_dev->io.NumPorts1-1); | ||
128 | return pcmcia_request_io(p_dev, &p_dev->io); | ||
129 | } | 124 | } |
130 | 125 | ||
131 | static int avmcs_config(struct pcmcia_device *link) | 126 | static int avmcs_config(struct pcmcia_device *link) |