patch-2.0.14 linux/drivers/sound/sequencer.c

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

diff -u --recursive --new-file v2.0.13/linux/drivers/sound/sequencer.c linux/drivers/sound/sequencer.c
@@ -1544,7 +1544,7 @@
 
       if (seq_mode != SEQ_2)
 	return -(EINVAL);
-      pending_timer = get_fs_long ((long *) arg);
+      pending_timer = get_user ((int *) arg);
 
       if (pending_timer < 0 || pending_timer >= num_sound_timers)
 	{
@@ -1591,7 +1591,7 @@
 				 */
 	return -(EIO);
 
-      midi_dev = get_fs_long ((long *) arg);
+      midi_dev = get_user ((int *) arg);
       if (midi_dev >= max_mididev)
 	return -(ENXIO);
 
@@ -1639,7 +1639,7 @@
       if (seq_mode == SEQ_2)
 	return tmr->ioctl (tmr_no, cmd, arg);
 
-      if (get_fs_long ((long *) arg) != 0)
+      if (get_user ((int *) arg) != 0)
 	return -(EINVAL);
 
       return snd_ioctl_return ((int *) arg, HZ);
@@ -1649,7 +1649,7 @@
       {
 	int             err;
 
-	dev = get_fs_long ((long *) arg);
+	dev = get_user ((int *) arg);
 	if (dev < 0 || dev >= num_synths)
 	  {
 	    return -(ENXIO);
@@ -1678,7 +1678,7 @@
 
     case SNDCTL_SYNTH_MEMAVL:
       {
-	int             dev = get_fs_long ((long *) arg);
+	int             dev = get_user ((int *) arg);
 
 	if (dev < 0 || dev >= num_synths)
 	  return -(ENXIO);
@@ -1692,7 +1692,7 @@
 
     case SNDCTL_FM_4OP_ENABLE:
       {
-	int             dev = get_fs_long ((long *) arg);
+	int             dev = get_user ((int *) arg);
 
 	if (dev < 0 || dev >= num_synths)
 	  return -(ENXIO);
@@ -1833,7 +1833,7 @@
 
     case SNDCTL_SEQ_THRESHOLD:
       {
-	int             tmp = get_fs_long ((long *) arg);
+	int             tmp = get_user ((int *) arg);
 
 	if (dev)		/*
 				 * Patch manager
@@ -1851,7 +1851,7 @@
 
     case SNDCTL_MIDI_PRETIME:
       {
-	int             val = get_fs_long ((long *) arg);
+	int             val = get_user ((int *) arg);
 
 	if (val < 0)
 	  val = 0;

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