summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-10-31 07:41:42 +0100
committerTakashi Iwai <tiwai@suse.de>2012-10-31 07:41:42 +0100
commit16c2e1fae8d60a9d6d16e009a76ba3472568e094 (patch)
tree830c2ff62a91d6ef29438aed1d5c03bd7c099ea5 /sound
parent0914f7961babbf28aaa2f19b453951fb4841c03f (diff)
downloadop-kernel-dev-16c2e1fae8d60a9d6d16e009a76ba3472568e094.zip
op-kernel-dev-16c2e1fae8d60a9d6d16e009a76ba3472568e094.tar.gz
ALSA: ice1724: Fix rate setup after resume
The rate isn't restored properly after resume since it's only set up in hw_params, and not in prepare callback. For fixing it, put the corresponding call to resume callback as well. Reported-and-tested-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ice1712/ice1724.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 3050a52..245d874 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2859,7 +2859,12 @@ static int snd_vt1724_resume(struct device *dev)
ice->set_spdif_clock(ice, 0);
} else {
/* internal on-card clock */
- snd_vt1724_set_pro_rate(ice, ice->pro_rate_default, 1);
+ int rate;
+ if (ice->cur_rate)
+ rate = ice->cur_rate;
+ else
+ rate = ice->pro_rate_default;
+ snd_vt1724_set_pro_rate(ice, rate, 1);
}
update_spdif_bits(ice, ice->pm_saved_spdif_ctrl);
OpenPOWER on IntegriCloud