From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 1 Dec 2009 14:57:01 +0000 (+0100)
Subject: Merge branch 'topic/ice1724-quartet' into topic/hda
X-Git-Tag: v2.6.33-rc1~77^2~14^2~2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=980f31c46b3c7895ad926fbb43c8edac6ce193ff

Merge branch 'topic/ice1724-quartet' into topic/hda
---

980f31c46b3c7895ad926fbb43c8edac6ce193ff
diff --cc sound/pci/ice1712/ice1724.c
index 10fc92c05574,3896fb931de1..ae29073eea93
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@@ -648,9 -672,11 +672,11 @@@ static int snd_vt1724_set_pro_rate(stru
  	    (inb(ICEMT1724(ice, DMA_PAUSE)) & DMA_PAUSES)) {
  		/* running? we cannot change the rate now... */
  		spin_unlock_irqrestore(&ice->reg_lock, flags);
 -		return -EBUSY;
 +		return ((rate == ice->cur_rate) && !force) ? 0 : -EBUSY;
  	}
  	if (!force && is_pro_rate_locked(ice)) {
+ 		/* comparing required and current rate - makes sense for
+ 		 * internal clock only */
  		spin_unlock_irqrestore(&ice->reg_lock, flags);
  		return (rate == ice->cur_rate) ? 0 : -EBUSY;
  	}