Commit ebf09724 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] illegal->invalid for dmasound

parent e5ab7589
...@@ -1660,13 +1660,13 @@ static int __init dmasound_setup(char *str) ...@@ -1660,13 +1660,13 @@ static int __init dmasound_setup(char *str)
#ifdef HAS_RECORD #ifdef HAS_RECORD
case 5: case 5:
if ((ints[5] < 0) || (ints[5] > MAX_CATCH_RADIUS)) if ((ints[5] < 0) || (ints[5] > MAX_CATCH_RADIUS))
printk("dmasound_setup: illegal catch radius, using default = %d\n", catchRadius); printk("dmasound_setup: invalid catch radius, using default = %d\n", catchRadius);
else else
catchRadius = ints[5]; catchRadius = ints[5];
/* fall through */ /* fall through */
case 4: case 4:
if (ints[4] < MIN_BUFFERS) if (ints[4] < MIN_BUFFERS)
printk("dmasound_setup: illegal number of read buffers, using default = %d\n", printk("dmasound_setup: invalid number of read buffers, using default = %d\n",
numReadBufs); numReadBufs);
else else
numReadBufs = ints[4]; numReadBufs = ints[4];
...@@ -1675,21 +1675,21 @@ static int __init dmasound_setup(char *str) ...@@ -1675,21 +1675,21 @@ static int __init dmasound_setup(char *str)
if ((size = ints[3]) < 256) /* check for small buffer specs */ if ((size = ints[3]) < 256) /* check for small buffer specs */
size <<= 10 ; size <<= 10 ;
if (size < MIN_BUFSIZE || size > MAX_BUFSIZE) if (size < MIN_BUFSIZE || size > MAX_BUFSIZE)
printk("dmasound_setup: illegal read buffer size, using default = %d\n", readBufSize); printk("dmasound_setup: invalid read buffer size, using default = %d\n", readBufSize);
else else
readBufSize = size; readBufSize = size;
/* fall through */ /* fall through */
#else #else
case 3: case 3:
if ((ints[3] < 0) || (ints[3] > MAX_CATCH_RADIUS)) if ((ints[3] < 0) || (ints[3] > MAX_CATCH_RADIUS))
printk("dmasound_setup: illegal catch radius, using default = %d\n", catchRadius); printk("dmasound_setup: invalid catch radius, using default = %d\n", catchRadius);
else else
catchRadius = ints[3]; catchRadius = ints[3];
/* fall through */ /* fall through */
#endif #endif
case 2: case 2:
if (ints[1] < MIN_BUFFERS) if (ints[1] < MIN_BUFFERS)
printk("dmasound_setup: illegal number of buffers, using default = %d\n", numWriteBufs); printk("dmasound_setup: invalid number of buffers, using default = %d\n", numWriteBufs);
else else
numWriteBufs = ints[1]; numWriteBufs = ints[1];
/* fall through */ /* fall through */
...@@ -1697,13 +1697,13 @@ static int __init dmasound_setup(char *str) ...@@ -1697,13 +1697,13 @@ static int __init dmasound_setup(char *str)
if ((size = ints[2]) < 256) /* check for small buffer specs */ if ((size = ints[2]) < 256) /* check for small buffer specs */
size <<= 10 ; size <<= 10 ;
if (size < MIN_BUFSIZE || size > MAX_BUFSIZE) if (size < MIN_BUFSIZE || size > MAX_BUFSIZE)
printk("dmasound_setup: illegal write buffer size, using default = %d\n", writeBufSize); printk("dmasound_setup: invalid write buffer size, using default = %d\n", writeBufSize);
else else
writeBufSize = size; writeBufSize = size;
case 0: case 0:
break; break;
default: default:
printk("dmasound_setup: illegal number of arguments\n"); printk("dmasound_setup: invalid number of arguments\n");
return 0; return 0;
} }
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment