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,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 08C2BC7618F for ; Mon, 15 Jul 2019 15:11:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAF6D2054F for ; Mon, 15 Jul 2019 15:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563203482; bh=27+fkck8RvRlwgSnIlrM1SjnoQ9LSZnfru2P0EIgqow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j5YWjp7Lki8l8GN2BmBL3HVex8Uj1EfIMa6UUW34HJJlQROMZXUrNt+KTiS3lAdl0 mjr05vl59W6pFFDC1M66EpuLnqcjimYzkLhRKsPTF+PJ+yfuDdL7lyV8Uw+4edP8sP 81PAK1sJTKwA08D6gsHqnPUmxSzjSnhRAihDEjlY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731957AbfGONy0 (ORCPT ); Mon, 15 Jul 2019 09:54:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:55154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730844AbfGONyZ (ORCPT ); Mon, 15 Jul 2019 09:54:25 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (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 08515206B8; Mon, 15 Jul 2019 13:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563198864; bh=27+fkck8RvRlwgSnIlrM1SjnoQ9LSZnfru2P0EIgqow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bhQCC/m4Umz2NkT2T7Dq9rIPnUL35Jt0+G3tOeQBtI6qNrqG7q5Qtim4XCL/nkIBo l7ZKOUYGLXmBOFZ/If3jVx26Y8xlGkci0f5xQr4+t1Rynkc2JQIr+laIvCGViffIh2 rg4xlUXs53d160JTh3kUcY4v0mjHDe407qArgVS0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nilkanth Ahirrao , Suresh Udipi , Jiada Wang , Kuninori Morimoto , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.2 122/249] ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_ Date: Mon, 15 Jul 2019 09:44:47 -0400 Message-Id: <20190715134655.4076-122-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-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: Nilkanth Ahirrao [ Upstream commit ac28ec07ae1c5c1e18ed6855eb105a328418da88 ] commit c16015f36cc1 ("ASoC: rsnd: add .get_id/.get_id_sub") introduces rsnd_ctu_id which calcualates and gives the main Device id of the CTU by dividing the id by 4. rsnd_mod_id uses this interface to get the CTU main Device id. But this commit forgets to revert the main Device id calcution previously done in rsnd_ctu_probe_ which also divides the id by 4. This path corrects the same to get the correct main Device id. The issue is observered when rsnd_ctu_probe_ is done for CTU1 Fixes: c16015f36cc1 ("ASoC: rsnd: add .get_id/.get_id_sub") Signed-off-by: Nilkanth Ahirrao Signed-off-by: Suresh Udipi Signed-off-by: Jiada Wang Acked-by: Kuninori Morimoto Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sh/rcar/ctu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index 8cb06dab234e..7647b3d4c0ba 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -108,7 +108,7 @@ static int rsnd_ctu_probe_(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - return rsnd_cmd_attach(io, rsnd_mod_id(mod) / 4); + return rsnd_cmd_attach(io, rsnd_mod_id(mod)); } static void rsnd_ctu_value_init(struct rsnd_dai_stream *io, -- 2.20.1