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

Next file: linux/drivers/sound/pss.c
Previous file: linux/drivers/sound/opl3.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/drivers/sound/patmgr.c linux/drivers/sound/patmgr.c
@@ -104,7 +104,7 @@
 
       if (mbox[dev] && msg_direction[dev] == A_TO_S)
 	{
-	  memcpy_tofs (&(buf)[0], (char *) mbox[dev], count);
+	  copy_to_user (&(buf)[0], (char *) mbox[dev], count);
 	  msg_direction[dev] = 0;
 	  ok = 1;
 	}
@@ -129,7 +129,7 @@
       return -(EIO);
     }
 
-  memcpy_fromfs ((char *) mbox[dev], &(buf)[0], 4);
+  copy_from_user ((char *) mbox[dev], &(buf)[0], 4);
 
   if (*(unsigned char *) mbox[dev] == SEQ_FULLSIZE)
     {
@@ -159,7 +159,7 @@
 
   if (mbox[dev] && !msg_direction[dev])
     {
-      memcpy_fromfs (&((char *) mbox[dev])[4], &(buf)[4], count - 4);
+      copy_from_user (&((char *) mbox[dev])[4], &(buf)[4], count - 4);
       msg_direction[dev] = S_TO_A;
 
       if ((appl_wait_flag.flags & WK_SLEEP))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov