From patchwork Tue Nov 26 14:16:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Louis Bossart X-Patchwork-Id: 180209 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp4699345ilf; Tue, 26 Nov 2019 06:21:15 -0800 (PST) X-Received: by 2002:a5d:5044:: with SMTP id h4mr165386wrt.4.1574777835044; Tue, 26 Nov 2019 06:17:15 -0800 (PST) X-Google-Smtp-Source: APXvYqwC8ofAqVKiJY161ac7UijQUaZcBLqgtRUHLuAE2vfIaNCEwe9ykXM/dAGPPi3VpzMAnPlF X-Received: by 2002:a5d:5044:: with SMTP id h4mr165299wrt.4.1574777834161; Tue, 26 Nov 2019 06:17:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574777834; cv=none; d=google.com; s=arc-20160816; b=PsJufjYfXK6sMwrAXynL/tdakw9i49YmbKpBe2cJnRIYSVTXb6svE65VaeRWequPGo s8rptH9zK0z7JzPk5a+Fc/f1N9B3gpg4UCov+tWa6RL/inJk/AzS2bJlTvIQe6XGueHq BKSlKRJL7kmmqipRNiZd6zugnmyeVswao/etQdtfyvjaUZdGnHJzKmV4BM9c2nn/QZ5r 1luoRKu7zU0zstxfo28O/B4zg+g/lh8hHiMVgemwA3yKhVt9omsWai2uYXU4XJMCe3S0 LoihFGqRsoRgxOjol74JvR+4Ub08HU+JDLGs8LFsPml5il3UevDkItDgi2336g1edR0v gGUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:dkim-filter:delivered-to :dkim-signature:dkim-filter; bh=6JUnkLc4DwvI+0lfE3WmQweZ4EGqEf6dkivJujDsBqM=; b=BINSf2PdMH1JN2asqgELzOOY9ggqT1YqYQdwT/8PfExtkkP3+/zrPHShVQTnCWgvGp yKD7Tu5uTFibbCH969N2sR9GvKWHnazwlqgq5ti3eNUx8AWrXDmVq6pVwmkhYl4wv68S C5s7rfnsHJy1ZvLlxjdWZx/s9K8oSiTCCYjzlFuDFKjCaS89pPxmhsyjRLlO/NPZZTgU VQL3W0R/mS+fPSxdHgYRfP8w87ojbUO9/JnAMOK+QHTY9slXKIB4bEujvYAg/fM73ZwC LabYhPpAGPxIP9xtwMEDRu7sI9eRC8QCHHbYHb44FNRSql0RBO7okEe5Ho7+r619rdoA i8Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alsa-project.org header.s=default header.b=qGthbh8z; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTPS id n20si9797983wrg.339.2019.11.26.06.17.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2019 06:17:14 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=pass header.i=@alsa-project.org header.s=default header.b=qGthbh8z; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 433321720; Tue, 26 Nov 2019 15:16:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 433321720 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1574777833; bh=0KSjAhwAmp2bt0LY+lvg2VmypZU3x6ptxmPe75jqkjs=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=qGthbh8z7F4wwViqWW4TY8njyZZzOVwtQA2qbj5dQJm3eKsQpeVV4USJPs84sl1vb RhhzdVTSkmZeK5EkUfTF27dUDs71jULDxdD1RB1AYbhU/h95tGkXFNRe/wdzk88rI0 gpQmZaslpW3UZl1G7b5gLPXUNb3I41Ii9au3/9h8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A7C98F801F7; Tue, 26 Nov 2019 15:16:16 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 72D2AF8020B; Tue, 26 Nov 2019 15:16:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 72B19F80149 for ; Tue, 26 Nov 2019 15:16:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 72B19F80149 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Nov 2019 06:16:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,246,1571727600"; d="scan'208";a="206470231" Received: from vramali2-mobl1.amr.corp.intel.com (HELO pbossart-mobl3.amr.corp.intel.com) ([10.251.155.193]) by fmsmga008.fm.intel.com with ESMTP; 26 Nov 2019 06:16:10 -0800 From: Pierre-Louis Bossart To: alsa-devel@alsa-project.org Date: Tue, 26 Nov 2019 08:16:06 -0600 Message-Id: <20191126141606.21650-1-pierre-louis.bossart@linux.intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: tiwai@suse.de, broonie@kernel.org, Daniel Baluta , Pierre-Louis Bossart Subject: [alsa-devel] [PATCH] ASoC: SOF: topology: Fix unload for SAI/ESAI X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Daniel Baluta Link unload now fails for ESAI/SAI DAIs with: "error: invalid DAI type 6" because DAI type is not properly handled. Fix this by correctly handling cases where type is ESAI or SAI. Fixes: a4eff5f86c9c5e7 ("ASoC: SOF: imx: Read ESAI parameters and send them to DSP") Signed-off-by: Daniel Baluta Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index d82ab981e840..e20b806ec80f 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -3132,7 +3132,9 @@ static int sof_link_unload(struct snd_soc_component *scomp, case SOF_DAI_INTEL_SSP: case SOF_DAI_INTEL_DMIC: case SOF_DAI_INTEL_ALH: - /* no resource needs to be released for SSP, DMIC and ALH */ + case SOF_DAI_IMX_SAI: + case SOF_DAI_IMX_ESAI: + /* no resource needs to be released for all cases above */ break; case SOF_DAI_INTEL_HDA: ret = sof_link_hda_unload(sdev, link);