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

• Lines: 45
• Date: Sun Oct 13 21:11:14 1996
• Orig file: v2.1.3/linux/drivers/sound/audio.c
• Orig date: Wed Oct 9 08:55:22 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/sound/audio.c linux/drivers/sound/audio.c
@@ -240,7 +240,7 @@
 	{			/*
 				 * No device specific copy routine
 				 */
-	  memcpy_fromfs (&dma_buf[buf_ptr], &(buf)[p], l);
+	  copy_from_user (&dma_buf[buf_ptr], &(buf)[p], l);
 	}
       else
 	audio_devs[dev]->d->copy_from_user (dev,
@@ -326,7 +326,7 @@
 	  translate_bytes (dsp_ulaw, (unsigned char *) dmabuf, l);
 	}
 
-      memcpy_tofs (&(buf)[p], dmabuf, l);
+      copy_to_user (&(buf)[p], dmabuf, l);
 
       DMAbuf_rmchars (dev, buf_no, l);
 
@@ -397,7 +397,7 @@
 	  if (err < 0)
 	    return err;
 
-	  memcpy_tofs (&((char *) arg)[0], (char *) &info, sizeof (info));
+	  copy_to_user (&((char *) arg)[0], (char *) &info, sizeof (info));
 	  return 0;
 	}
 
@@ -420,7 +420,7 @@
 	  if (DMAbuf_get_curr_buffer (dev, &buf_no, &dma_buf, &buf_ptr, &buf_size) >= 0)
 	    info.bytes -= buf_ptr;
 
-	  memcpy_tofs (&((char *) arg)[0], (char *) &info, sizeof (info));
+	  copy_to_user (&((char *) arg)[0], (char *) &info, sizeof (info));
 	  return 0;
 	}
 
@@ -447,7 +447,7 @@
 
 	  info |= DSP_CAP_MMAP;
 
-	  memcpy_tofs (&((char *) arg)[0], (char *) &info, sizeof (info));
+	  copy_to_user (&((char *) arg)[0], (char *) &info, sizeof (info));
 	  return 0;
 	}
 	break;