patch-2.1.107 linux/drivers/char/mem.c

• Lines: 38
• Date: Wed Jun 24 14:44:00 1998
• Orig file: v2.1.106/linux/drivers/char/mem.c
• Orig date: Tue Jun 23 10:01:22 1998

diff -u --recursive --new-file v2.1.106/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -41,8 +41,8 @@
 #ifdef CONFIG_VIDEO_DEV
 extern int videodev_init(void);
 #endif
-#if defined(CONFIG_FB)
-extern void fbmem_init( void );
+#ifdef CONFIG_FB
+extern void fbmem_init(void);
 #endif
 
 static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp,
@@ -63,7 +63,7 @@
 		written+=sz;
 	}
 #endif
-	if (copy_from_user(p, buf, count) < 0) 
+	if (copy_from_user(p, buf, count)) 
 		return -EFAULT;
 	written += count;
 	*ppos += written;
@@ -104,7 +104,7 @@
 		}
 	}
 #endif
-	if (copy_to_user(buf, __va(p), count) < 0)
+	if (copy_to_user(buf, __va(p), count))
 		return -EFAULT;
 	read += count;
 	*ppos += read;
@@ -552,7 +552,7 @@
 #endif
 #ifdef CONFIG_JOYSTICK
 	/*
-	 *	Some joysticks only appear when the soundcard they are
+	 *	Some joysticks only appear when the sound card they are
 	 *	connected to is configured. Keep the sound/joystick ordering.
 	 */
 	js_init();