patch-1.3.78 linux/drivers/sound/sound_switch.c

Next file: linux/drivers/sound/soundcard.c
Previous file: linux/drivers/sound/sound_config.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.77/linux/drivers/sound/sound_switch.c linux/drivers/sound/sound_switch.c
@@ -523,12 +523,12 @@
   if (((cmd >> 8) & 0xff) == 'M' && num_mixers > 0)	/* Mixer ioctl */
     if ((dev & 0x0f) != SND_DEV_CTL)
       {
+#ifdef CONFIG_AUDIO
 	int             dtype = dev & 0x0f;
 	int             mixdev;
 
 	switch (dtype)
 	  {
-#ifdef CONFIG_AUDIO
 	  case SND_DEV_DSP:
 	  case SND_DEV_DSP16:
 	  case SND_DEV_AUDIO:
@@ -536,12 +536,9 @@
 	    if (mixdev < 0 || mixdev >= num_mixers)
 	      return -ENXIO;
 	    return mixer_devs[mixdev]->ioctl (mixdev, cmd, arg);
-	    break;
-#endif
-
-	  default:
-	    return mixer_devs[0]->ioctl (0, cmd, arg);
 	  }
+#endif
+	  return mixer_devs[0]->ioctl (0, cmd, arg);
       }
 
   switch (dev & 0x0f)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this