From 6f90989c6fbd21f02884d9976e1967430eced527 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 31 Jul 2003 05:15:46 -0700 Subject: [PATCH] [PATCH] some isdn invalid/illegal fixups (Steven Cole) --- drivers/isdn/capi/capidrv.c | 2 +- drivers/isdn/eicon/eicon_isa.c | 4 ++-- drivers/isdn/hardware/avm/b1isa.c | 2 +- drivers/isdn/hardware/avm/t1isa.c | 2 +- drivers/isdn/hardware/eicon/message.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 83ac9fb2c15..8ea64ec7eea 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c @@ -1596,7 +1596,7 @@ static int capidrv_command(isdn_ctrl * c, capidrv_contr * card) rc = FVteln2capi20(bchan->num, AdditionalInfo); isleasedline = (rc == 0); if (rc < 0) - printk(KERN_ERR "capidrv-%d: WARNING: illegal leased linedefinition \"%s\"\n", card->contrnr, bchan->num); + printk(KERN_ERR "capidrv-%d: WARNING: invalid leased linedefinition \"%s\"\n", card->contrnr, bchan->num); if (isleasedline) { calling[0] = 0; diff --git a/drivers/isdn/eicon/eicon_isa.c b/drivers/isdn/eicon/eicon_isa.c index b11a085a60f..a2853ceac99 100644 --- a/drivers/isdn/eicon/eicon_isa.c +++ b/drivers/isdn/eicon/eicon_isa.c @@ -90,7 +90,7 @@ eicon_isa_find_card(int Mem, int Irq, char * Id) if ((Mem < 0x0c0000) || (Mem > 0x0fc000) || (Mem & 0xfff)) { - printk(KERN_WARNING "eicon_isa: illegal membase 0x%x for %s\n", + printk(KERN_WARNING "eicon_isa: invalid membase 0x%x for %s\n", Mem, Id); return -1; } @@ -326,7 +326,7 @@ eicon_isa_load(eicon_isa_card *card, eicon_isa_codebuf *cb) { /* Check for valid IRQ */ if ((card->irq < 0) || (card->irq > 15) || (!((1 << card->irq) & eicon_isa_valid_irq[card->type & 0x0f]))) { - printk(KERN_WARNING "eicon_isa_load: illegal irq: %d\n", card->irq); + printk(KERN_WARNING "eicon_isa_load: invalid irq: %d\n", card->irq); eicon_isa_release_shmem(card); kfree(code); return -EINVAL; diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c index 80af7f3ba92..7ae02c5bd91 100644 --- a/drivers/isdn/hardware/avm/b1isa.c +++ b/drivers/isdn/hardware/avm/b1isa.c @@ -78,7 +78,7 @@ static int __init b1isa_probe(struct pci_dev *pdev) if ( card->port != 0x150 && card->port != 0x250 && card->port != 0x300 && card->port != 0x340) { - printk(KERN_WARNING "b1isa: illegal port 0x%x.\n", card->port); + printk(KERN_WARNING "b1isa: invalid port 0x%x.\n", card->port); retval = -EINVAL; goto err_free; } diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c index c89e192a83c..ab572e7ee7f 100644 --- a/drivers/isdn/hardware/avm/t1isa.c +++ b/drivers/isdn/hardware/avm/t1isa.c @@ -370,7 +370,7 @@ static int __init t1isa_probe(struct pci_dev *pdev, int cardnr) sprintf(card->name, "t1isa-%x", card->port); if (!(((card->port & 0x7) == 0) && ((card->port & 0x30) != 0x30))) { - printk(KERN_WARNING "t1isa: illegal port 0x%x.\n", card->port); + printk(KERN_WARNING "t1isa: invalid port 0x%x.\n", card->port); retval = -EINVAL; goto err_free; } diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c index 8fcc595633f..88b254b0ed5 100644 --- a/drivers/isdn/hardware/eicon/message.c +++ b/drivers/isdn/hardware/eicon/message.c @@ -4487,7 +4487,7 @@ void control_rc(PLCI * plci, byte req, byte rc, byte ch, byte global_req, byte if(rc==WRONG_IE) { Info = 0x2007; /* Illegal message parameter coding */ - dbug(1,dprintf("MWI_REQ illegal parameter")); + dbug(1,dprintf("MWI_REQ invalid parameter")); } else { -- 2.11.4.GIT