summaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-08 15:58:25 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-08 15:58:25 +0100
commit17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch)
tree16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/pci/ice1712
parentc9adeefda0e29bed628e40e7f9da1f84243937e7 (diff)
parent8bb4d9ce08b0a92ca174e41d92c180328f86173f (diff)
downloadlinux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.bz2
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/ice1712')
-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 58b4b6f85db3..26feeb81a709 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2866,7 +2866,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);