summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <launchpad.web@epost.diwic.se>2009-10-11 11:37:22 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-09 16:22:57 -0800
commit474ac4951f31a678cda82833c6ec6dbb4b58bacb (patch)
tree521f4d0bf892464c176d8acb78ad9f6f97f082dd
parent027590f053888a282d09f420a39ad08a17dda76f (diff)
downloadlwn-474ac4951f31a678cda82833c6ec6dbb4b58bacb.tar.gz
lwn-474ac4951f31a678cda82833c6ec6dbb4b58bacb.zip
ALSA: ice1724 - Make call to set hw params succeed on ESI Juli@
commit bd3c200e6d5495343c91db66d2acf1853b57a141 upstream. 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 <launchpad.web@epost.diwic.se> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--sound/pci/ice1712/ice1724.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index cc84a831eb21..56d1bd8b6118 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -643,7 +643,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);