patch-2.3.13 linux/drivers/sbus/audio/audio.c

• Lines: 36
• Date: Fri Aug 6 11:58:00 1999
• Orig file: v2.3.12/linux/drivers/sbus/audio/audio.c
• Orig date: Wed May 12 08:41:15 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/sbus/audio/audio.c linux/drivers/sbus/audio/audio.c
@@ -313,7 +313,7 @@
     kill_procs(drv->sd_siglist,SIGPOLL,S_MSG);
 
     /* Stop the lowlevel driver from outputing. */
-    /* drv->ops->stop_output(drv); Should not be necessary  -- DJB 5/25/98 */
+    drv->ops->stop_output(drv); 
     drv->output_active = 0;
 		  
     /* Wake up any waiting writers or syncers and return. */
@@ -669,7 +669,7 @@
   case SOUND_MIXER_WRITE_CD:
   case SOUND_MIXER_WRITE_LINE:
   case SOUND_MIXER_WRITE_IMIX:
-    if(get_user(k, arg))
+    if(COPY_IN(arg, k))
       return -EFAULT;
     tprintk(("setting input volume (0x%x)", k));
     if (drv->ops->get_input_channels)
@@ -700,7 +700,7 @@
   case SOUND_MIXER_WRITE_PCM:
   case SOUND_MIXER_WRITE_VOLUME:
   case SOUND_MIXER_WRITE_SPEAKER:
-    if(get_user(k, arg))
+    if(COPY_IN(arg, k))
 	return -EFAULT;
     tprintk(("setting output volume (0x%x)", k));
     if (drv->ops->get_output_channels)
@@ -741,7 +741,7 @@
   case SOUND_MIXER_WRITE_RECSRC: 
     if (!drv->ops->set_input_port)
       return -EINVAL;
-    if(get_user(k, arg))
+    if(COPY_IN(arg, k))
       return -EFAULT;
     /* only one should ever be selected */
     if (k & SOUND_MASK_IMIX) j = AUDIO_ANALOG_LOOPBACK;