patch-2.1.4 linux/drivers/cdrom/mcd.c

• Lines: 72
• Date: Sun Oct 13 21:11:10 1996
• Orig file: v2.1.3/linux/drivers/cdrom/mcd.c
• Orig date: Fri Apr 12 09:49:33 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/cdrom/mcd.c linux/drivers/cdrom/mcd.c
@@ -371,7 +371,7 @@
 		if (st)
 			return st;
 
-		memcpy_fromfs(&ti, (void *) arg, sizeof ti);
+		copy_from_user(&ti, (void *) arg, sizeof ti);
 
 		if (ti.cdti_trk0 < DiskInfo.first
 			|| ti.cdti_trk0 > DiskInfo.last
@@ -414,7 +414,7 @@
 		if (st)
 			return st;
 
-		memcpy_fromfs(&msf, (void *) arg, sizeof msf);
+		copy_from_user(&msf, (void *) arg, sizeof msf);
 
 		/* convert to bcd */
 
@@ -455,7 +455,7 @@
 
 		tocHdr.cdth_trk0 = DiskInfo.first;
 		tocHdr.cdth_trk1 = DiskInfo.last;
-		memcpy_tofs((void *) arg, &tocHdr, sizeof tocHdr);
+		copy_to_user((void *) arg, &tocHdr, sizeof tocHdr);
 		return 0;
 
 	case CDROMREADTOCENTRY:      /* Read an entry in the table of contents */
@@ -464,7 +464,7 @@
 		if (st)
 			return st;
 
-		memcpy_fromfs(&entry, (void *) arg, sizeof entry);
+		copy_from_user(&entry, (void *) arg, sizeof entry);
 		if (entry.cdte_track == CDROM_LEADOUT)
 			/* XXX */
 			tocPtr = &Toc[DiskInfo.last + 1];
@@ -492,7 +492,7 @@
 		else
 			return -EINVAL;
 
-		memcpy_tofs((void *) arg, &entry, sizeof entry);
+		copy_to_user((void *) arg, &entry, sizeof entry);
 		return 0;
 
 	case CDROMSUBCHNL:   /* Get subchannel info */
@@ -501,7 +501,7 @@
 		if (st)
 			return st;
 
-		memcpy_fromfs(&subchnl, (void *) arg, sizeof subchnl);
+		copy_from_user(&subchnl, (void *) arg, sizeof subchnl);
 
 		if (GetQChannelInfo(&qInfo) < 0)
 			return -EIO;
@@ -532,7 +532,7 @@
 		else
 			return -EINVAL;
 
-		memcpy_tofs((void *) arg, &subchnl, sizeof subchnl);
+		copy_to_user((void *) arg, &subchnl, sizeof subchnl);
 		return 0;
 
 	case CDROMVOLCTRL:   /* Volume control */
@@ -540,7 +540,7 @@
 		if (st)
 			return st;
 
-		memcpy_fromfs(&volctrl, (char *) arg, sizeof(volctrl));
+		copy_from_user(&volctrl, (char *) arg, sizeof(volctrl));
 		outb(MCMD_SET_VOLUME, MCDPORT(0));
 		outb(volctrl.channel0, MCDPORT(0));
 		outb(255, MCDPORT(0));