Merge branch 'topic/sscape-fix' into for-linus

diff --cc sound/isa/Kconfig
Simple merge

diff --cc sound/isa/sscape.c
Simple merge

diff --cc sound/isa/wss/wss_lib.c
index ac27832,f0c0be5..5d2ba1b
--- 1/sound/isa/wss/wss_lib.c
--- 2/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@@ -837,9 -851,10 +861,10 @@@ static void snd_wss_init(struct snd_ws
                            chip->image[CS4231_REC_FORMAT]);
        spin_unlock_irqrestore(&chip->reg_lock, flags);
        snd_wss_mce_down(chip);
+       snd_wss_calibrate_mute(chip, 0);
  
  #ifdef SNDRV_DEBUG_MCE
 -      snd_printk("init: (5)\n");
 +      snd_printk(KERN_DEBUG "init: (5)\n");
  #endif
  }