From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 11 Oct 2009 16:07:47 +0000 (+0200)
Subject: Merge branch 'fix/misc' into for-next
X-Git-Tag: next-20110726~34^2~1034
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cb12ee5cff733bcc79a6aefa7409b953161540c8;p=karo-tx-linux.git

Merge branch 'fix/misc' into for-next
---

cb12ee5cff733bcc79a6aefa7409b953161540c8
diff --cc sound/pci/ice1712/ice1724.c
index 3455cc5c6407,10fc92c05574..ae29073eea93
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@@ -672,11 -648,9 +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;
  	}