From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 23 Mar 2009 23:36:21 +0000 (+0100)
Subject: Merge branch 'topic/sscape-fix' into for-linus
X-Git-Tag: v2.6.30-rc1~676^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d0807323345f1cd8ab578b09aab04d10862e9414;p=linux.git

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

d0807323345f1cd8ab578b09aab04d10862e9414
diff --cc sound/isa/wss/wss_lib.c
index ac27832b2c6f,f0c0be5bb684..5d2ba1b749ab
--- a/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
  }