lkml.org 
[lkml]   [2003]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectPATCH: some isdn invalid/illegal fixups
(Steven Cole)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/isdn/capi/capidrv.c linux-2.6.0-test2-ac1/drivers/isdn/capi/capidrv.c
--- linux-2.6.0-test2/drivers/isdn/capi/capidrv.c 2003-07-10 21:08:51.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/isdn/capi/capidrv.c 2003-07-15 18:01:29.000000000 +0100
@@ -1596,7 +1596,7 @@
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 -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/isdn/eicon/eicon_isa.c linux-2.6.0-test2-ac1/drivers/isdn/eicon/eicon_isa.c
--- linux-2.6.0-test2/drivers/isdn/eicon/eicon_isa.c 2003-07-10 21:05:28.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/isdn/eicon/eicon_isa.c 2003-07-15 18:01:29.000000000 +0100
@@ -90,7 +90,7 @@
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 @@
/* 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 -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/isdn/hardware/avm/b1isa.c linux-2.6.0-test2-ac1/drivers/isdn/hardware/avm/b1isa.c
--- linux-2.6.0-test2/drivers/isdn/hardware/avm/b1isa.c 2003-07-10 21:08:52.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/isdn/hardware/avm/b1isa.c 2003-07-15 18:01:29.000000000 +0100
@@ -78,7 +78,7 @@

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 -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/isdn/hardware/avm/t1isa.c linux-2.6.0-test2-ac1/drivers/isdn/hardware/avm/t1isa.c
--- linux-2.6.0-test2/drivers/isdn/hardware/avm/t1isa.c 2003-07-10 21:11:00.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/isdn/hardware/avm/t1isa.c 2003-07-15 18:01:29.000000000 +0100
@@ -370,7 +370,7 @@
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 -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.6.0-test2/drivers/isdn/hardware/eicon/message.c linux-2.6.0-test2-ac1/drivers/isdn/hardware/eicon/message.c
--- linux-2.6.0-test2/drivers/isdn/hardware/eicon/message.c 2003-07-10 21:11:35.000000000 +0100
+++ linux-2.6.0-test2-ac1/drivers/isdn/hardware/eicon/message.c 2003-07-15 18:01:29.000000000 +0100
@@ -4487,7 +4487,7 @@
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
{
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:47    [W:0.016 / U:1.616 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site