Merge with Linux 2.3.40.

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/inflate.c b/lib/inflate.c
index 3dca73c72..7b707075a 100644
--- a/lib/inflate.c
+++ b/lib/inflate.c
@@ -7,7 +7,7 @@
  * Adapted for booting Linux by Hannu Savolainen 1993
  * based on gzip-1.0.3 
  *
- * Nicolas Pitre <nico@visuaide.com>, 1999/04/14 :
+ * Nicolas Pitre <nico@cam.org>, 1999/04/14 :
  *   Little mods for all variable to reside either into rodata or bss segments
  *   by marking constant variables with 'const' and initializing all the others
  *   at run-time only.  This allows for the kernel uncompressor to run
diff --git a/lib/string.c b/lib/string.c
index 89850b44f..9872f15a5 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -370,7 +370,7 @@ void *memchr(const void *s, int c, size_t n)
 	const unsigned char *p = s;
 	while (n-- != 0) {
         	if ((unsigned char)c == *p++) {
-			return (void *)p-1;
+			return (void *)(p-1);
 		}
 	}
 	return NULL;