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

• Lines: 79
• Date: Sun Aug 18 10:46:49 1996
• Orig file: v2.0.13/linux/drivers/sound/gus_wave.c
• Orig date: Wed Jul 10 13:11:15 1996

diff -u --recursive --new-file v2.0.13/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -2195,7 +2195,7 @@
     case SOUND_PCM_WRITE_RATE:
       if (local)
 	return gus_audio_set_speed ((int) arg);
-      return snd_ioctl_return ((int *) arg, gus_audio_set_speed (get_fs_long ((long *) arg)));
+      return snd_ioctl_return ((int *) arg, gus_audio_set_speed (get_user ((int *) arg)));
       break;
 
     case SOUND_PCM_READ_RATE:
@@ -2207,13 +2207,13 @@
     case SNDCTL_DSP_STEREO:
       if (local)
 	return gus_audio_set_channels ((int) arg + 1) - 1;
-      return snd_ioctl_return ((int *) arg, gus_audio_set_channels (get_fs_long ((long *) arg) + 1) - 1);
+      return snd_ioctl_return ((int *) arg, gus_audio_set_channels (get_user ((int *) arg) + 1) - 1);
       break;
 
     case SOUND_PCM_WRITE_CHANNELS:
       if (local)
 	return gus_audio_set_channels ((int) arg);
-      return snd_ioctl_return ((int *) arg, gus_audio_set_channels (get_fs_long ((long *) arg)));
+      return snd_ioctl_return ((int *) arg, gus_audio_set_channels (get_user ((int *) arg)));
       break;
 
     case SOUND_PCM_READ_CHANNELS:
@@ -2225,7 +2225,7 @@
     case SNDCTL_DSP_SETFMT:
       if (local)
 	return gus_audio_set_bits ((int) arg);
-      return snd_ioctl_return ((int *) arg, gus_audio_set_bits (get_fs_long ((long *) arg)));
+      return snd_ioctl_return ((int *) arg, gus_audio_set_bits (get_user ((int *) arg)));
       break;
 
     case SOUND_PCM_READ_BITS:
@@ -3046,7 +3046,7 @@
 	switch (cmd & 0xff)
 	  {
 	  case SOUND_MIXER_RECSRC:
-	    gus_recmask = get_fs_long ((long *) arg) & MIX_DEVS;
+	    gus_recmask = get_user ((int *) arg) & MIX_DEVS;
 	    if (!(gus_recmask & (SOUND_MASK_MIC | SOUND_MASK_LINE)))
 	      gus_recmask = SOUND_MASK_MIC;
 	    /* Note! Input volumes are updated during next open for recording */
@@ -3055,7 +3055,7 @@
 
 	  case SOUND_MIXER_MIC:
 	    {
-	      int             vol = get_fs_long ((long *) arg) & 0xff;
+	      int             vol = get_user ((int *) arg) & 0xff;
 
 	      if (vol < 0)
 		vol = 0;
@@ -3069,7 +3069,7 @@
 
 	  case SOUND_MIXER_LINE:
 	    {
-	      int             vol = get_fs_long ((long *) arg) & 0xff;
+	      int             vol = get_user ((int *) arg) & 0xff;
 
 	      if (vol < 0)
 		vol = 0;
@@ -3082,7 +3082,7 @@
 	    break;
 
 	  case SOUND_MIXER_PCM:
-	    gus_pcm_volume = get_fs_long ((long *) arg) & 0xff;
+	    gus_pcm_volume = get_user ((int *) arg) & 0xff;
 	    if (gus_pcm_volume < 0)
 	      gus_pcm_volume = 0;
 	    if (gus_pcm_volume > 100)
@@ -3095,7 +3095,7 @@
 	    {
 	      int             voice;
 
-	      gus_wave_volume = get_fs_long ((long *) arg) & 0xff;
+	      gus_wave_volume = get_user ((int *) arg) & 0xff;
 
 	      if (gus_wave_volume < 0)
 		gus_wave_volume = 0;