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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 5A763C76186 for ; Wed, 24 Jul 2019 19:49:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 228A4217D4 for ; Wed, 24 Jul 2019 19:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997759; bh=RHgChTb5kJ4u726IVWqaoD99WXZwv8fFPgWtTGxTtps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T7W9zM6y0+dU/miZlxYHUfduxu1LNrmSyrAZiNbPFrdbYpjylmJey8ENi9EIdOsMB tlkLJxWvMgwaUPNBiwGBvcAjzyiXDG9wl9ju3GoHST6p/fJNlx8JLZMlISR0TFEQ7r CEidX/aWlTP+lVP7BZ7WHrvjCH7qVivpvg5YV26w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390751AbfGXTsR (ORCPT ); Wed, 24 Jul 2019 15:48:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:55442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391034AbfGXTsQ (ORCPT ); Wed, 24 Jul 2019 15:48:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 49210217D4; Wed, 24 Jul 2019 19:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997695; bh=RHgChTb5kJ4u726IVWqaoD99WXZwv8fFPgWtTGxTtps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EFIibBDwPX/uFU9Usb6uXJvsHvmnMBOzLQol5o/BTaXzlHx+RJ8Sd8k4dmY/xPAUp go63dj/X4/w6ztOrVRar5XX6/ulFx1/sBjBSTZo1EfPkjioEoqtBc4i6pFv2ekCvwT PIxoISfTSqSK7Cob/iQkCdOXl3Hpc3Q89R7nK20E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nilkanth Ahirrao , Suresh Udipi , Jiada Wang , Kuninori Morimoto , Mark Brown , Sasha Levin Subject: [PATCH 5.1 110/371] ASoC: rsnd: fixup mod ID calculation in rsnd_ctu_probe_ Date: Wed, 24 Jul 2019 21:17:42 +0200 Message-Id: <20190724191733.121027994@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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