From patchwork Thu Jan 21 01:57:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 8076671 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E81A3BEEE5 for ; Thu, 21 Jan 2016 02:02:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25C54205DD for ; Thu, 21 Jan 2016 02:02:24 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 0A311205DA for ; Thu, 21 Jan 2016 02:02:23 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 118E9265CF4; Thu, 21 Jan 2016 03:02:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 60531265E07; Thu, 21 Jan 2016 02:59:31 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3E5D4265E07; Thu, 21 Jan 2016 02:59:30 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 16F3E26070C for ; Thu, 21 Jan 2016 02:57:20 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 21 Jan 2016 10:57:19 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id A1D874CBD2; Thu, 21 Jan 2016 10:57:19 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 8438E2806E; Thu, 21 Jan 2016 10:57:19 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7B8642806D; Thu, 21 Jan 2016 10:57:19 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id LAJ17148; Thu, 21 Jan 2016 10:57:19 +0900 X-IronPort-AV: E=Sophos;i="5.22,323,1449500400"; d="scan'";a="202684547" Received: from mail-hk2apc01lp0213.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.213]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 21 Jan 2016 10:57:19 +0900 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HKXPR06MB1016.apcprd06.prod.outlook.com (10.161.181.156) with Microsoft SMTP Server (TLS) id 15.1.365.19; Thu, 21 Jan 2016 01:57:17 +0000 Message-ID: <87h9i74s0p.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <87r3hb4s53.wl%kuninori.morimoto.gx@renesas.com> References: <87r3hb4s53.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 21 Jan 2016 01:57:17 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0006.apcprd02.prod.outlook.com (25.164.90.144) To HKXPR06MB1016.apcprd06.prod.outlook.com (25.161.181.156) X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 2:UMKBAvu95x645WXLC2uxSTNimXGzX5cQ6CMCMszsj0dKnxp1Aq8BGQsm2dOQO6t4qTxO7JOf5XK7HnG62So1GXuaACenaMFCk7b/taep2STlJeeXPqbX7/buYcKG/0B6nClspj6XMwc89wKUMJLwfQ==; 3:gg3xfXrIBd6OD2RpwwSZogMj9gs5IvzKnnhUrcV367RYO8Yo4gyzwwqXUHPgGiTt3B7B/Yuq3RZZolez9fArFjjsx6osyEBtxHp9ZKEgN5fkYyHbTAz3JhB1tmaAp8hc; 25:MgqrcYXAdeViOM770MJMa9oFk5SCprQS7K4AmAxPG8s3V/yX46+aP19BhVG0PJCvLvVHN2cpBVJY00+vf30SJX9fiqmIOfoqOHXziFuCWvltXFEPV1A3BY0ry2FYbL2tk/9mKzIR5iR4pVNocXzPYdAjoEpK6Fp4aJSD7QIgnTKQzsEef1uVwqjewRjEgPJYvMrDufTaDlDz3if0lJUbsYjHC4CE4Rr+mp0Q3I5cGhgSAzAYJk+2utVQycGHulCO X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB1016; X-MS-Office365-Filtering-Correlation-Id: a8736357-6f10-4897-ed9f-08d32206315b X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 20:62k0YIpB3s4c0U7tI6uBZHqrEOtQImVgbiqqyqIWQEAbXvMOhjVskbFeIAtz3ErFjKwu4ikhtvqm/y9hVSx8/BEd420VtPXm0KEPC0yIIKdEPclklaBnRuzzVhHhocrzyxQ93Zw4YHISAdy+rvgkeXwRAajyh0G5gedaEyA5NPfboHYeJghNffSLv5PegFqW5O6gR8Wghpa7HNwCX5JVz243bDye7CmYJO6rTPDMpPo7YZT9Pw0TniDDYvu2Mes/le18hA6N7zaUaxe/VjtZbVPZhKVvvSRO5MQLIP+rCd30tN5vb2d+zV8w6IL7H+xfGsj2u7xb3DPFv7HLqBKerOnrXU7JaiazzKQt6lVIiEE+r82iV//m1CK6M9Ew7hTdlAX4VWasVUDhTtyPk3j+PS4x4R6xSKLutiMDjZazJO9l8CTMnvNRoC2vezAg4he7LvpC2zHzgmwc5aicRSlqpbsHDdlgwanwBkFRTBXbHrrhZQxDuB85wXwqnq0BYFdN; 4:t9ieIhVEe1n45Eo1dadVonYK/Lh36tjKhxqRx0/UeCHvCtKSLVv4ZCWlWRpWPX/ja+Pv87SGLfsqqx/jexxME7XocHBCQbUPIw5DqKcfeJn2mZNBNXvtHHkpVJJognaLLzjcpq9614lwA8OHrGLDQKcko/7cRyjUeVbWxQu1p+kpP0a/CCMdncZzv7xz88pWdZl/usldvw7NucKwlkdIzRtKyJr+Hc1pLfADDQ8FNpDC2ZlDK3yExzfCP3B3obI4n6eQFZpyTi7nweA4F53oK68MsJsSFdycmlfVbw92qBW98MHfIfw01ntQhp/IR+hMqKHxLpFM63cBKSrHpW+Of2RSZ4zL9AH3LfdK7CsMG3KAaB7AcPsnOymdhR3qUED4FUQqdM9u4WZ+APtq41Z0s+XYdmqQDpdPsL32PuDDFNvXKSW9yU/Gcgu1YsWkF8Y2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:HKXPR06MB1016; BCL:0; PCL:0; RULEID:; SRVR:HKXPR06MB1016; X-Forefront-PRVS: 08286A0BE2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(87976001)(101416001)(19580405001)(2906002)(19580395003)(47776003)(33646002)(76176999)(50986999)(69596002)(54356999)(83506001)(66066001)(189998001)(5001960100002)(229853001)(4001350100001)(110136002)(86362001)(81156007)(40100003)(5004730100002)(97736004)(5008740100001)(122386002)(586003)(3846002)(23726003)(1096002)(6116002)(2950100001)(4326007)(77096005)(53416004)(105586002)(42186005)(106356001)(46406003)(92566002)(50466002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB1016; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HKXPR06MB1016; 23:LM7yIpZO1fwhi0h9Wr2G6c321J+MASLeK1+N2f5n6?= =?us-ascii?Q?ftR24LNz5eAQ8TZ6VP6U0wesJbDfS6Skyxw2b1r5uli82uXRqL7Eq6p9JP4U?= =?us-ascii?Q?2xRzqm6q/kARO4tp/3TbRP4vNkvB3Gwlv2x9LmV/9ahyJbiJuM6QTq3tP6Ma?= =?us-ascii?Q?K2lfAXVxRZfYKHLawKf0Kkv/7+4iRZsBwmliBfUY+mnNpy1Yvrv7nty22Beg?= =?us-ascii?Q?LBGa4v+e9kNqzApz7vjBqt5IvrbBc1vD/04aUpcW94C1VwAxjImCafUfIzYm?= =?us-ascii?Q?bT1iUJ1ngyYs0he3Tf+tVEMorfjqhH/w9dP+8lzQMvfPzlGEi6Czu4NUaabz?= =?us-ascii?Q?KT/u/gAn2mJqia+9Ty4LXKWNla5MaA7RQJbqClbH3bDIvcd3z+Dj1XACijk9?= =?us-ascii?Q?DC8Ekhazc9NHHfpInGFKQ7ijYZZFsupqDdUk68XUlV+0p+23DdrDMiMYNSEQ?= =?us-ascii?Q?tNsej697qCi4KrrX6d3Vxuy5Uyrg4rFAfqRQjlqXKoOBi5kyudH+sL9kClbS?= =?us-ascii?Q?FIZCZSznlGWSosyu9GaEU/+9EEI/VK7ftZ0L8Al7Q2LBfG2xuOR5dxr41QJs?= =?us-ascii?Q?nRCA/EQomH6X2+JBfSLW2kxG2ymvH40VCwO7Ye/WLcmwJpuZjafW/Dl5sRwt?= =?us-ascii?Q?nUd7+8zrYOAR5rnOAxJdrWWVdvNDpW1BfQm/mEaLNdnPIvWikRwPushdh7mY?= =?us-ascii?Q?HVaiNZfqlNif/ZyF5PKR/xHZyjgqG/NvEqsBg34Detzz5WDRcga4lm5w1Hl3?= =?us-ascii?Q?0C3lJpccXjFj4Cca08hgVv+upcgbNBLOuwHY/xE4PmW7OkbzdEwSbH+mu8bV?= =?us-ascii?Q?ft0jR8GEGa6ojlZfZuagaj/ttwsDnWGEWD7muEsEKlSlXPedQsxdrz6g3AI6?= =?us-ascii?Q?tIB04OPVI2tD++q3Lk/UwE2EgJ9YjHe+5Rvao8qRuqGaHLVKfXnL4sRr3tCb?= =?us-ascii?Q?DpYeG+NxNOUAfT8y6yeG+8wtlUXn3SQg+uKfgPkOpvf4xXoop3g+sIUUrxjq?= =?us-ascii?Q?m/HJSLsoJ8UaP4W5Q/zmEzvek6azKO8GXjPAkAYq0Kqb4mKjAUkzQdP9TFSv?= =?us-ascii?Q?vhxTTWAdAL0lbaqOsJUu0mS3YpZDemsoJA2GHatQHkjE7UtBfimHY1CkoOqM?= =?us-ascii?Q?CZAbENc/hxEZwnJO5fx0pVO0R44BZUT?= X-Microsoft-Exchange-Diagnostics: 1; HKXPR06MB1016; 5:Yi5e17GcBj9Ths+xfwL/y5A0iYq6wqd3eSi45sWQvwg25ASOy4YAuAYJVGk0rkpSIOVGUabzrDEU95PUxytQE0Y/vMPRLyQ1ckZkAGBSJlnEYGD8jP39wQv94BksZWiO8FcFeskaj6H2S5bY4Lejcw==; 24:Yrm6VLaO1Ntf/OgN/vEhDj/Oc/8owJFUsD4arvcftSA1e/qeSgomdR+ZuocV1AFgh4R6EMUEhBoumfiVEm0KqykZMCihKI6GRr82CIv9PFo=; 20:KIyO2fTsi9UxJoM4CuMHhBNYFYGkNeMhLtkVoUaORYec8myCC4q38hBgjCJ9/9vAZMkdj3vX65OZb1XLfexafhkyaBezR+5TIbbBHILnxiMMYirhzFLTuJ16uqdLqrwAnqTHqOn8xv6HSlNibGnxCEWtRxurP2pexBhCrXe17KQ= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2016 01:57:17.8721 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB1016 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 07/15] ASoC: rsnd: don't overwrite io on rsnd_cmd_init() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current rsnd_cmd_init() overwrites "io" which will be used end of this function. This patch solved this issue. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/cmd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index cd1f064..e77e493 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -38,6 +38,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, if (mix) { struct rsnd_dai *rdai; + struct rsnd_dai_stream *tio; int i; u32 path[] = { [0] = 0, @@ -55,12 +56,12 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, */ data = 0; for_each_rsnd_dai(rdai, priv, i) { - io = &rdai->playback; - if (mix == rsnd_io_to_mod_mix(io)) + tio = &rdai->playback; + if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; - io = &rdai->capture; - if (mix == rsnd_io_to_mod_mix(io)) + tio = &rdai->capture; + if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; }