Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756113Ab2JQG5l (ORCPT ); Wed, 17 Oct 2012 02:57:41 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60933 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312Ab2JQG5k (ORCPT ); Wed, 17 Oct 2012 02:57:40 -0400 Date: Wed, 17 Oct 2012 08:57:39 +0200 Message-ID: From: Takashi Iwai To: Ondrej Zary Cc: alsa-devel@alsa-project.org, broonie@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: Re: [alsa-devel] [PATCH 5/5] snd-ice1712: Fix resume on ice1724 In-Reply-To: <1350241763-7248-6-git-send-email-linux@rainbow-software.org> References: <1350241763-7248-1-git-send-email-linux@rainbow-software.org> <1350241763-7248-6-git-send-email-linux@rainbow-software.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1229 Lines: 40 At Sun, 14 Oct 2012 21:09:23 +0200, Ondrej Zary wrote: > > 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. > > Signed-off-by: Ondrej Zary This should be fixed in the resume callback. Could you check the patch below instead? thanks, Takashi --- diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 161c8f6..5cc3fa5 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/