From: David Henningsson Date: Sun, 11 Oct 2009 09:37:22 +0000 (+0200) Subject: ALSA: ice1724 - Make call to set hw params succeed on ESI Juli@ X-Git-Tag: v2.6.32-rc6~14^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bd3c200e6d5495343c91db66d2acf1853b57a141;p=profile%2Fivi%2Fkernel-x86-ivi.git ALSA: ice1724 - Make call to set hw params succeed on ESI Juli@ If two streams are started immediately after one another (such as a playback and a recording stream), the call to set hw params fails with EBUSY. This patch makes the call succeed, so playback and recording will work properly. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 76b717d..10fc92c 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -648,7 +648,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, (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)) { spin_unlock_irqrestore(&ice->reg_lock, flags);