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

• Lines: 36
• Date: Sun Oct 13 21:11:15 1996
• Orig file: v2.1.3/linux/drivers/sound/gus_wave.c
• Orig date: Sun Aug 18 10:46:49 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -1083,7 +1083,7 @@
     {
     case SNDCTL_SYNTH_INFO:
       gus_info.nr_voices = nr_voices;
-      memcpy_tofs (&((char *) arg)[0], &gus_info, sizeof (gus_info));
+      copy_to_user (&((char *) arg)[0], &gus_info, sizeof (gus_info));
       return 0;
       break;
 
@@ -1732,7 +1732,7 @@
    * been transferred already.
    */
 
-  memcpy_fromfs (&((char *) &patch)[offs], &(addr)[offs], sizeof_patch - offs);
+  copy_from_user (&((char *) &patch)[offs], &(addr)[offs], sizeof_patch - offs);
 
   instr = patch.instr_no;
 
@@ -1885,7 +1885,7 @@
 	   * OK, move now. First in and then out.
 	   */
 
-	  memcpy_fromfs (audio_devs[gus_devnum]->dmap_out->raw_buf, &(addr)[sizeof_patch + src_offs], blk_sz);
+	  copy_from_user (audio_devs[gus_devnum]->dmap_out->raw_buf, &(addr)[sizeof_patch + src_offs], blk_sz);
 
 	  save_flags (flags);
 	  cli ();
@@ -2637,7 +2637,7 @@
 {
   if (gus_audio_channels == 1)
     {
-      memcpy_fromfs (&localbuf[localoffs], &(userbuf)[useroffs], len);
+      copy_from_user (&localbuf[localoffs], &(userbuf)[useroffs], len);
     }
   else if (gus_audio_bits == 8)
     {