From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95FD8CA9EC7 for ; Wed, 30 Oct 2019 15:50:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 67742208E3 for ; Wed, 30 Oct 2019 15:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572450618; bh=AesfdGlm8YQjMxu4s+FElDE3//jeAMGU3vcsCdV64L0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nQ5hRf6nwigkugWmkTLkySyW4HRxzj4kn3PSdgpg7agrvYsGLc3L0SUZDcvPsFfBz yFc6K5GIPNlWp6X+hac8FL2tRyMg5sjFO9KXjvCa1Xhkddr+SBD9p1NafBdn/AFRN6 kzQh1SlkSD8AwaAShPiX9Sfp4F0cg5d7pb3lMRYY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727575AbfJ3PuM (ORCPT ); Wed, 30 Oct 2019 11:50:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:50896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727201AbfJ3PuM (ORCPT ); Wed, 30 Oct 2019 11:50:12 -0400 Received: from sasha-vm.mshome.net (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C610520856; Wed, 30 Oct 2019 15:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572450611; bh=AesfdGlm8YQjMxu4s+FElDE3//jeAMGU3vcsCdV64L0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gStvRPr3aGJ/9MTyymnagKeT6R2visvWUGtDB93I4x6veNHikAUTuUg+2fLW26g1m tTI/VVk3dgPiaA9lzGO8jcIt2K5Bc0itDx3G5w1PZd0ax4da3VPzWcmGXew4stdPuT wayxA9iu6XUXO9LpD+k+Cd8R7r8eS9O8fc8MBQ7Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Keyon Jie , Pierre-Louis Bossart , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.3 13/81] ASoC: SOF: topology: fix parse fail issue for byte/bool tuple types Date: Wed, 30 Oct 2019 11:48:19 -0400 Message-Id: <20191030154928.9432-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191030154928.9432-1-sashal@kernel.org> References: <20191030154928.9432-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Keyon Jie [ Upstream commit 2e305a074061121220a2828f97a57d315cf8efba ] We are using sof_parse_word_tokens() to parse tokens with bool/byte/short/word tuple types, here add the missing check, to fix the parsing failure at byte/bool tuple types. Signed-off-by: Keyon Jie Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20190927200538.660-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 432ae343f9602..96230329e678f 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -907,7 +907,9 @@ static void sof_parse_word_tokens(struct snd_soc_component *scomp, for (j = 0; j < count; j++) { /* match token type */ if (!(tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_WORD || - tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_SHORT)) + tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_SHORT || + tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_BYTE || + tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_BOOL)) continue; /* match token id */ -- 2.20.1