aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/elsa_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/hisax/elsa_cs.c')
-rw-r--r--drivers/isdn/hisax/elsa_cs.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c
index 425deea1dd6..c10bfd3f458 100644
--- a/drivers/isdn/hisax/elsa_cs.c
+++ b/drivers/isdn/hisax/elsa_cs.c
@@ -214,23 +214,21 @@ static int __devinit elsa_cs_config(struct pcmcia_device *link)
214 link->conf.ConfigIndex); 214 link->conf.ConfigIndex);
215 if (link->conf.Attributes & CONF_ENABLE_IRQ) 215 if (link->conf.Attributes & CONF_ENABLE_IRQ)
216 printk(", irq %d", link->irq); 216 printk(", irq %d", link->irq);
217 if (link->io.NumPorts1) 217 if (link->resource[0])
218 printk(", io 0x%04x-0x%04x", link->io.BasePort1, 218 printk(" & %pR", link->resource[0]);
219 link->io.BasePort1+link->io.NumPorts1-1); 219 if (link->resource[1])
220 if (link->io.NumPorts2) 220 printk(" & %pR", link->resource[1]);
221 printk(" & 0x%04x-0x%04x", link->io.BasePort2,
222 link->io.BasePort2+link->io.NumPorts2-1);
223 printk("\n"); 221 printk("\n");
224 222
225 icard.para[0] = link->irq; 223 icard.para[0] = link->irq;
226 icard.para[1] = link->io.BasePort1; 224 icard.para[1] = link->resource[0]->start;
227 icard.protocol = protocol; 225 icard.protocol = protocol;
228 icard.typ = ISDN_CTYPE_ELSA_PCMCIA; 226 icard.typ = ISDN_CTYPE_ELSA_PCMCIA;
229 227
230 i = hisax_init_pcmcia(link, &(((local_info_t*)link->priv)->busy), &icard); 228 i = hisax_init_pcmcia(link, &(((local_info_t*)link->priv)->busy), &icard);
231 if (i < 0) { 229 if (i < 0) {
232 printk(KERN_ERR "elsa_cs: failed to initialize Elsa PCMCIA %d at i/o %#x\n", 230 printk(KERN_ERR "elsa_cs: failed to initialize Elsa "
233 i, link->io.BasePort1); 231 "PCMCIA %d with %pR\n", i, link->resource[0]);
234 elsa_cs_release(link); 232 elsa_cs_release(link);
235 } else 233 } else
236 ((local_info_t*)link->priv)->cardnr = i; 234 ((local_info_t*)link->priv)->cardnr = i;