diff options
Diffstat (limited to 'drivers/isdn/hisax/sedlbauer_cs.c')
-rw-r--r-- | drivers/isdn/hisax/sedlbauer_cs.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index 5dbad966a29e..cecb35ab9d3d 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c | |||
@@ -296,27 +296,25 @@ static int __devinit sedlbauer_config(struct pcmcia_device *link) | |||
296 | printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); | 296 | printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); |
297 | if (link->conf.Attributes & CONF_ENABLE_IRQ) | 297 | if (link->conf.Attributes & CONF_ENABLE_IRQ) |
298 | printk(", irq %d", link->irq); | 298 | printk(", irq %d", link->irq); |
299 | if (link->io.NumPorts1) | 299 | if (link->resource[0]) |
300 | printk(", io 0x%04x-0x%04x", link->io.BasePort1, | 300 | printk(" & %pR", link->resource[0]); |
301 | link->io.BasePort1+link->io.NumPorts1-1); | 301 | if (link->resource[1]) |
302 | if (link->io.NumPorts2) | 302 | printk(" & %pR", link->resource[1]); |
303 | printk(" & 0x%04x-0x%04x", link->io.BasePort2, | ||
304 | link->io.BasePort2+link->io.NumPorts2-1); | ||
305 | if (link->win) | 303 | if (link->win) |
306 | printk(", mem 0x%06lx-0x%06lx", req->Base, | 304 | printk(", mem 0x%06lx-0x%06lx", req->Base, |
307 | req->Base+req->Size-1); | 305 | req->Base+req->Size-1); |
308 | printk("\n"); | 306 | printk("\n"); |
309 | 307 | ||
310 | icard.para[0] = link->irq; | 308 | icard.para[0] = link->irq; |
311 | icard.para[1] = link->io.BasePort1; | 309 | icard.para[1] = link->resource[0]->start; |
312 | icard.protocol = protocol; | 310 | icard.protocol = protocol; |
313 | icard.typ = ISDN_CTYPE_SEDLBAUER_PCMCIA; | 311 | icard.typ = ISDN_CTYPE_SEDLBAUER_PCMCIA; |
314 | 312 | ||
315 | ret = hisax_init_pcmcia(link, | 313 | ret = hisax_init_pcmcia(link, |
316 | &(((local_info_t *)link->priv)->stop), &icard); | 314 | &(((local_info_t *)link->priv)->stop), &icard); |
317 | if (ret < 0) { | 315 | if (ret < 0) { |
318 | printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d at i/o %#x\n", | 316 | printk(KERN_ERR "sedlbauer_cs: failed to initialize SEDLBAUER PCMCIA %d with %pR\n", |
319 | ret, link->io.BasePort1); | 317 | ret, link->resource[0]); |
320 | sedlbauer_release(link); | 318 | sedlbauer_release(link); |
321 | return -ENODEV; | 319 | return -ENODEV; |
322 | } else | 320 | } else |