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

diff --cc sound/pci/ice1712/ice1712.c
Simple merge

diff --cc sound/pci/ice1712/ice1724.c
index 10fc92c055749679a4e36922d8b7f784b6f6d528,3896fb931de111d990b159e30ee2bf0205ca68f8..ae29073eea93f94f283411c68f21aef8956791cf
--- 1/sound/pci/ice1712/ice1724.c
--- 2/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;
        }