aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/bkm_a4t.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/hisax/bkm_a4t.c')
-rw-r--r--drivers/isdn/hisax/bkm_a4t.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
index 3d1bdc8431ad..9ca2ee54cc94 100644
--- a/drivers/isdn/hisax/bkm_a4t.c
+++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -20,8 +20,6 @@
20#include <linux/pci.h> 20#include <linux/pci.h>
21#include "bkm_ax.h" 21#include "bkm_ax.h"
22 22
23extern const char *CardType[];
24
25static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $"; 23static const char *bkm_a4t_revision = "$Revision: 1.22.2.4 $";
26 24
27 25
@@ -284,15 +282,16 @@ static int __devinit a4t_cs_init(struct IsdnCard *card,
284 I20_REGISTER_FILE *pI20_Regs; 282 I20_REGISTER_FILE *pI20_Regs;
285 283
286 if (!cs->irq) { /* IRQ range check ?? */ 284 if (!cs->irq) { /* IRQ range check ?? */
287 printk(KERN_WARNING "HiSax: %s: No IRQ\n", CardType[card->typ]); 285 printk(KERN_WARNING "HiSax: Telekom A4T: No IRQ\n");
288 return (0); 286 return (0);
289 } 287 }
290 cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096); 288 cs->hw.ax.base = (long) ioremap(pci_memaddr, 4096);
291 /* Check suspecious address */ 289 /* Check suspecious address */
292 pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base); 290 pI20_Regs = (I20_REGISTER_FILE *) (cs->hw.ax.base);
293 if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) { 291 if ((pI20_Regs->i20IntStatus & 0x8EFFFFFF) != 0) {
294 printk(KERN_WARNING "HiSax: %s address %lx-%lx suspecious\n", 292 printk(KERN_WARNING "HiSax: Telekom A4T address "
295 CardType[card->typ], cs->hw.ax.base, cs->hw.ax.base + 4096); 293 "%lx-%lx suspicious\n",
294 cs->hw.ax.base, cs->hw.ax.base + 4096);
296 iounmap((void *) cs->hw.ax.base); 295 iounmap((void *) cs->hw.ax.base);
297 cs->hw.ax.base = 0; 296 cs->hw.ax.base = 0;
298 return (0); 297 return (0);
@@ -302,8 +301,9 @@ static int __devinit a4t_cs_init(struct IsdnCard *card,
302 cs->hw.ax.isac_ale = GCS_1; 301 cs->hw.ax.isac_ale = GCS_1;
303 cs->hw.ax.jade_ale = GCS_3; 302 cs->hw.ax.jade_ale = GCS_3;
304 303
305 printk(KERN_INFO "HiSax: %s: Card configured at 0x%lX IRQ %d\n", 304 printk(KERN_INFO "HiSax: Telekom A4T: Card configured at "
306 CardType[card->typ], cs->hw.ax.base, cs->irq); 305 "0x%lX IRQ %d\n",
306 cs->hw.ax.base, cs->irq);
307 307
308 setup_isac(cs); 308 setup_isac(cs);
309 cs->readisac = &ReadISAC; 309 cs->readisac = &ReadISAC;
@@ -349,11 +349,12 @@ setup_bkm_a4t(struct IsdnCard *card)
349 break; 349 break;
350 } 350 }
351 if (!found) { 351 if (!found) {
352 printk(KERN_WARNING "HiSax: %s: Card not found\n", CardType[card->typ]); 352 printk(KERN_WARNING "HiSax: Telekom A4T: Card not found\n");
353 return (0); 353 return (0);
354 } 354 }
355 if (!pci_memaddr) { 355 if (!pci_memaddr) {
356 printk(KERN_WARNING "HiSax: %s: No Memory base address\n", CardType[card->typ]); 356 printk(KERN_WARNING "HiSax: Telekom A4T: "
357 "No Memory base address\n");
357 return (0); 358 return (0);
358 } 359 }
359 360