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

• Lines: 90
• Date: Sun Oct 13 21:11:15 1996
• Orig file: v2.1.3/linux/drivers/sound/pss.c
• Orig date: Tue Jul 23 10:26:53 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/sound/pss.c linux/drivers/sound/pss.c
@@ -493,7 +493,7 @@
 	if (buf == NULL)
 	  return -(ENOSPC);
 
-	memcpy_fromfs ((char *) buf, &((char *) arg)[0], sizeof (*buf));
+	copy_from_user ((char *) buf, &((char *) arg)[0], sizeof (*buf));
 	err = download_boot_block (dev_info, buf);
 	vfree (buf);
 	return err;
@@ -511,7 +511,7 @@
 	if (buf == NULL)
 	  return -(ENOSPC);
 
-	memcpy_fromfs ((char *) buf, &((char *) arg)[0], sizeof (*buf));
+	copy_from_user ((char *) buf, &((char *) arg)[0], sizeof (*buf));
 
 	data = (unsigned short *) (buf->data);
 
@@ -524,7 +524,7 @@
 	      {
 		restore_flags (flags);
 		buf->len = i;	/* feed back number of WORDs sent */
-		memcpy_tofs (&((char *) arg)[0], &buf, sizeof (buf));
+		copy_to_user (&((char *) arg)[0], &buf, sizeof (buf));
 		vfree (buf);
 		return -(EIO);
 	      }
@@ -569,7 +569,7 @@
 
 	restore_flags (flags);
 
-	memcpy_tofs (&((char *) arg)[0], &buf, sizeof (buf));
+	copy_to_user (&((char *) arg)[0], &buf, sizeof (buf));
 	vfree (buf);
 
 	return err;
@@ -583,7 +583,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs ((char *) &buf, &((char *) arg)[0], sizeof (buf));
+	copy_from_user ((char *) &buf, &((char *) arg)[0], sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -608,7 +608,7 @@
 	buf.parm1 = tmp;
 	restore_flags (flags);
 
-	memcpy_tofs (&((char *) arg)[0], &buf, sizeof (buf));
+	copy_to_user (&((char *) arg)[0], &buf, sizeof (buf));
 	return 0;
       }
       break;
@@ -619,7 +619,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs ((char *) &buf, &((char *) arg)[0], sizeof (buf));
+	copy_from_user ((char *) &buf, &((char *) arg)[0], sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -653,7 +653,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs ((char *) &buf, &((char *) arg)[0], sizeof (buf));
+	copy_from_user ((char *) &buf, &((char *) arg)[0], sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -694,7 +694,7 @@
 	unsigned long   flags;
 	unsigned short  tmp;
 
-	memcpy_fromfs ((char *) &buf, &((char *) arg)[0], sizeof (buf));
+	copy_from_user ((char *) &buf, &((char *) arg)[0], sizeof (buf));
 
 	save_flags (flags);
 	cli ();
@@ -728,7 +728,7 @@
 
 	restore_flags (flags);
 
-	memcpy_tofs (&((char *) arg)[0], &buf, sizeof (buf));
+	copy_to_user (&((char *) arg)[0], &buf, sizeof (buf));
 	return 0;
       }
       break;