Skip to contentSkip to conversation

snd-ice1712: Fix resume on ice1724

PATCH Ondrej Zary 2 participants 2 messages Oct 30, 2012 – Oct 31, 2012

lore
Share & tools
lore
#0 lore raw
Quoted 11 lines · On Wednesday 17 October 2012 08:57:39 Takashi Iwai wrote:

At Sun, 14 Oct 2012 21:09:23 +0200,

Quoted 5 lines · Ondrej Zary

set_pro_rate() is called from hw_params() but not from prepare(), breaking running PCM on suspend/resume. Call it from prepare() if PCM was suspended to fix the problem.

This should be fixed in the resume callback. Could you check the patch below instead?

I've now verified that this patch fixes a real problem. When "multi track rate locking" is disabled and some sound is played at non-default (non-48kHz) frequency during suspend, the frequency is wrong (48kHz) after resume. This patch fixes that.

Quoted 28 lines

thanks,

Takashi

---

sound/pci/ice1712/ice1724.c +6 -2
index 161c8f6..5cc3fa5 100644
@@ -2867,7 +2867,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);
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 1 line
Ondrej Zary
#1 lore raw

At Tue, 30 Oct 2012 20:34:00 +0100,

Quoted 11 lines · Ondrej Zary
Quoted 9 lines · On Wednesday 17 October 2012 08:57:39 Takashi Iwai wrote:

At Sun, 14 Oct 2012 21:09:23 +0200,

Quoted 5 lines · Ondrej Zary

set_pro_rate() is called from hw_params() but not from prepare(), breaking running PCM on suspend/resume. Call it from prepare() if PCM was suspended to fix the problem.

Quoted 7 lines
Quoted 2 lines

This should be fixed in the resume callback. Could you check the patch below instead?

I've now verified that this patch fixes a real problem. When "multi track rate locking" is disabled and some sound is played at non-default (non-48kHz) frequency during suspend, the frequency is wrong (48kHz) after resume. This patch fixes that.

OK, the patch was applied now. Thanks for checking.

Takashi