patch-2.1.4 linux/drivers/sound/dmasound.c

• Lines: 36
• Date: Sun Oct 13 21:11:15 1996
• Orig file: v2.1.3/linux/drivers/sound/dmasound.c
• Orig date: Sat Jul 6 11:31:43 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/sound/dmasound.c linux/drivers/sound/dmasound.c
@@ -717,7 +717,7 @@
     if (sound.soft.stereo)
 	count &= ~1;
     used = count;
-    memcpy_fromfs(p, userPtr, count);
+    copy_from_user(p, userPtr, count);
     *frameUsed += used;
     return(used);
 }
@@ -771,7 +771,7 @@
 	void *p = (u_short *)&frame[*frameUsed];
 	count = min(userCount, frameLeft) & ~3;
 	used = count;
-	memcpy_fromfs(p, userPtr, count);
+	copy_from_user(p, userPtr, count);
 	*frameUsed += used;
     }
     return(used);
@@ -1265,7 +1265,7 @@
 	void *p = &frame[*frameUsed];
 	count = min(userCount, frameLeft) & ~1;
 	used = count;
-	memcpy_fromfs(p, userPtr, count);
+	copy_from_user(p, userPtr, count);
     } else {
 	u_char *left = &frame[*frameUsed>>1];
 	u_char *right = left+sq.block_size_half;
@@ -2908,7 +2908,7 @@
 	n = count;
     if (n <= 0)
 	return(0);
-    memcpy_tofs(dest, &state.buf[state.ptr], n);
+    copy_to_user(dest, &state.buf[state.ptr], n);
     state.ptr += n;
     return(n);
 }