diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-10-11 18:07:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-10-11 18:07:47 +0200 |
| commit | cb12ee5cff733bcc79a6aefa7409b953161540c8 (patch) | |
| tree | 724c3780cd751554f9a78febc9766c73d745e72e /sound/pci | |
| parent | f400a3dc25b4c2bd1837c11b05299a12b9b017e2 (diff) | |
| parent | bd3c200e6d5495343c91db66d2acf1853b57a141 (diff) | |
Merge branch 'fix/misc' into for-next
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 3455cc5c6407..ae29073eea93 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -672,7 +672,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)) { /* comparing required and current rate - makes sense for |