Message ID | 87vb9zsio7.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 89e3e2c352a523be46be5104bf18e200a8ccd444 |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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 2ABC1BEEA4 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 22 Oct 2015 03:18:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58F112093C for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 22 Oct 2015 03:18:43 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 18B71205F9 for <patchwork-alsa-devel@patchwork.kernel.org>; Thu, 22 Oct 2015 03:18:42 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 264852669A4; Thu, 22 Oct 2015 05:18:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_LOW, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id B46E2266A4B; Thu, 22 Oct 2015 05:16:30 +0200 (CEST) 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 41C88266A4B; Thu, 22 Oct 2015 05:16:29 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 909CB2669EA for <alsa-devel@alsa-project.org>; Thu, 22 Oct 2015 05:14:48 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 22 Oct 2015 12:14:46 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 0B43651932; Thu, 22 Oct 2015 12:14:47 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 08BBB480A3; Thu, 22 Oct 2015 12:14:47 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 036AE48014; Thu, 22 Oct 2015 12:14:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id NAE05410; Thu, 22 Oct 2015 12:14:46 +0900 X-IronPort-AV: E=Sophos;i="5.20,180,1444662000"; d="scan'";a="197008659" Received: from mail-pu1apc01lp0021.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.21]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 22 Oct 2015 12:14:45 +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 SIXPR06MB1024.apcprd06.prod.outlook.com (10.160.242.28) with Microsoft SMTP Server (TLS) id 15.1.300.14; Thu, 22 Oct 2015 03:14:43 +0000 Message-ID: <87vb9zsio7.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org> In-Reply-To: <874mhjtxcn.wl%kuninori.morimoto.gx@renesas.com> References: <874mhjtxcn.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 22 Oct 2015 03:14:43 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: HK2PR02CA0022.apcprd02.prod.outlook.com (25.163.104.160) To SIXPR06MB1024.apcprd06.prod.outlook.com (25.160.242.28) X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB1024; 2:ezX9hhDPaN6ugsCEnLlhplISzs6zVMk73Zgl6PB4ulTw75SwvF3t2tvB4ltPvW78KZliE62hKPbzr/i1SLjaVFZS407v/Q9lPFLgw1av6hSCB3OVnTI890J5LNyUXJrANQelreNYlIvaQXtF5KLcMXRVWYnE76mTKm3BqZFb+pA=; 3:2hun9HNu6UREh9m79dwzEEmfJmTdU7MAMSOurLOMnPRBBO86WkK0U98GHS4H++96zAYKGVN0NRBqhM0UQo0S+92pZHmcurVAJaNNXbopL/S36RRQcoIMgjDS8Fazyu0syXLGkuPLAxOEHmqVnzI9BA==; 25:pHSCZzUL6VKxC0k0s4h+vAnZ6YzOpMUACAIpELPHsVME1x+Hh0rA4USs3IKHoV/wJB/BYcVePXIS45YtPJXRAa/OeKoPsyWeobTms5Buhrjmk5uuEBlCjc8R7q/k/QrB5/Qi9BzHgrslXwEbY7D78bRVzHWxy8ydDnwTxbpWAn1jtIDshlkrMh+0iOlXJFnIG94jQgxKnDJqgnxSMOax16QkfCSOr5Hfelhx1Y12Kd8G9lHtjgrT0EDmVF6f7GbccG2sMq5eMjARr9nV3ylEwA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB1024; X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB1024; 20:KW2hp/5JLqpoumD2nKx30wnAd7UhIbcmxghXUG9NIrsPWs5dcM45X4sfl3UCbTL77ZBePoorH+bro8+9fyRa9/son1VswvPrKHVHzBFa0gdq13p3Nf/B26G5SluwE/X+G6KIq07hcPWc5lKGYzL6S1UA/1osXMDeVrq6wbpcH1OPZU8jDlH6++0VQ/9t9MFL88sTiFUtIdQhsBSm5r5y+BXfPJ92oydAQqLVN7wExChKB69KpGoZefKLSE1yVdwmMcm4Xmvf7ffXMtI3M39VedbBYexxl53G4oZBCLrDPDlhei3rkDcJF4XWl+knosw2tpS07rcse3D6AjRNazjOmHj33W9VUu7wLbgxr5b7SXNbsrTj6tJBy4/2RlubHt8lQRtrn6JlxOou3CWT3NPSZMeA6tXJd78x9e802BlVFHdMCBir0Rp05KaDB+vFEWYzc2NPWn+Au5a+708rfLxAMcpSct24egSqfdYKb2mYk967EOW1YEh+/Mhr3au+w+lf; 4:VFs2/gwgF3jZGu6d2/6y1CnJB1WaxUEfvDvahdvy4ck1qtzRp4zhUcvbF+0Hm+5ECBOJ37wXDi43JBUETs436XoQ7E0jbr45HBh5n05APmW590EY6ofWdjpw5+ByJTfbh774w0SB1hd27K5Ct/CKIf8jGOIbwnZyosmQySV1o4ol55ARhZ5DM4jslyYnlNHGjteUdhdIkd7040VActBUoADqgSiCa7fW46NEBlbFP2ECIad0px9oSzKz2eH9XjMTjMkADtYSyE7LVorqMSJcx0Rn6Bg11EQP3qGvWw1X9FHMfRKwKIMRWFJKcJiG2lHfouBlnUXpfRFQxJzxXdQRqCQFMMyhOXHed+l2qE8xU3M= X-Microsoft-Antispam-PRVS: <SIXPR06MB10240B40D3B8594482EEAC96D4270@SIXPR06MB1024.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001); SRVR:SIXPR06MB1024; BCL:0; PCL:0; RULEID:; SRVR:SIXPR06MB1024; X-Forefront-PRVS: 0737B96801 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(110136002)(5001960100002)(101416001)(97736004)(5007970100001)(189998001)(50466002)(92566002)(64706001)(5004730100002)(40100003)(4001350100001)(46406003)(36756003)(122386002)(19580395003)(69596002)(23726002)(19580405001)(33646002)(105586002)(106356001)(50986999)(5008740100001)(83506001)(86362001)(229853001)(81156007)(42186005)(46102003)(87976001)(76176999)(54356999)(77096005)(47776003)(66066001)(2950100001)(53416004)(334744003)(142923001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB1024; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SIXPR06MB1024; 23:t/RIQUibnP1YjfbuoqKUEFE+eJXkJD9AVQsieVCwZ?= =?us-ascii?Q?sWcpDYa0RQCzMhJFVhAz4fODEzQZCorKkYdRLBUaIx41IKxnvWOC/04I4zoW?= =?us-ascii?Q?gF4CKKDIe7Xga8mb/YGVG1AsgceuUKJ3ZvOmdyUKVeaoTDQDeHd0WEkzrGOC?= =?us-ascii?Q?Za8FcjzJOzzF5GEKiC0LYm8Ki3xISwWb9eMC/vyd29yx1kA2eYYxipl3buQM?= =?us-ascii?Q?WR4/LhJV41TxrsEsfS6uHup5bRHA+2StAenCSww4AViRhDEUKLwhS9zihhuH?= =?us-ascii?Q?nN6CbYO4kXEG53pml5R5pEDdxeNIj4yG2JowXXwXiW3jCIztKScIqCFc/fDK?= =?us-ascii?Q?rtrlpw1YHu1eYFTxk/aPMJmFXMtNI+hYdr/guT8aNCEGGlI7bbMq7wsIE30k?= =?us-ascii?Q?oqEhpWXW8chk2q7UNPninACItCN3maLSCMyJZ2gvXoYeVkqalchigqcg7eeH?= =?us-ascii?Q?KARtA1hjccTSVJALasbNxqjYKnVLMhKwz7fQBqCjuF1LeMkIesrKkgerlnZT?= =?us-ascii?Q?BKJF6ZHKACfCWxrtfs2q7YPpFZTGTBGF2ZNrSC4/tRqdfkXNrxI2aNUWp+8m?= =?us-ascii?Q?rC7l5fgeGECma8rbSwakA40fBwp1g94fVVQfnd74xMwH7/4LolTzHmmbAIbQ?= =?us-ascii?Q?m1oNZ1ib+D2VAwEaBGRZkUmMgeiEUDREGykc+v3yoqq7ucnR8SMURgliujoI?= =?us-ascii?Q?LS/8D/A2s3e4G5SvdPRHgHh7CROudaKU/YWoWrd8X/FdKTGw586cmnrAoZ0Y?= =?us-ascii?Q?Oo8ywfLtkeJzFAN4mMu17pDLlS6PEnQFh2d4RVUzIi/126+zAvzACZFh+oVf?= =?us-ascii?Q?EtpuxfboSt6JaPusppDEqTX7xSU4i8CHOxOkKfSr4HjvoVhW7EFaU4WtN/YA?= =?us-ascii?Q?X4bFgnMJg2A0echZruGUUPDWo/O1RkVlit5mf++Rm4U307k2uu3g727yOQHl?= =?us-ascii?Q?cAEd8tjKYy6Cbrm4LYFBIX6OLVrRjJFCyLf1LixtfqH/3E8wfEJ+T6Jdy+no?= =?us-ascii?Q?kxFI+MKnrUSQLPBs9iF9Ff6kYHXuVdthehzlSmlEJNElvlnbjbn3+bm9L4DD?= =?us-ascii?Q?/hSi6hm0UB9V1do5+ZB5KnAeKHbYk23Em8OEV0twt/unKBTKlxw5mPKjPQKA?= =?us-ascii?Q?nXBX4VfaIZiQmA92y7HXgme0DMflTJZ66DPxh3g6n1rdI7xUs7JQg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SIXPR06MB1024; 5:jGlOMPz8V7wdiIFUZTcBuoAVCMCJftUxHcceUeGDUfkoQ5ENIK/ezZXatxWMOtt1985gdY1/ye5I+28U1pLzxIc+qZdmsWW3Q0UBrQYwlbqdw+TcqH+rS7jEPP+DYTbU1zhgJBuBD3mBzHJ7784FTg==; 24:x9hcuUEgT7PcOUrHKfw/I0u1nFvamsst1XZF1rZBq/2xizrAHJN6ZkfC2MCYK1qBNTTKZKY+5Co+EIKYYAetJef7hyGJ5HfUjdVZ1s4lT3Y=; 20:pWvV+J6ifO0xfu0sjY0pelsY0Fw3DC8+LspLorh9bJbpelo1qALHFgj10qBDGlC280LrCZePI2c680mRqDYpvvUv8mVv6ql42plJFFfQZNNj4jyTd/u2MDXN/GFSc2RJmqEMp58DAwogMp6psnhlk2qdBHmavRh+vYhbKRj/Y9A= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2015 03:14:43.4033 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB1024 Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: [alsa-devel] [PATCH 6/9] ASoC: rsnd: fixup rsnd_dai_call() behavior for .stop/.quit 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 5c67144..deed48e 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -327,9 +327,7 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io) mod = (io)->mod[i]; \ if (!mod) \ continue; \ - ret = rsnd_mod_call(mod, io, fn, param); \ - if (ret < 0) \ - break; \ + ret |= rsnd_mod_call(mod, io, fn, param); \ } \ ret; \ }) @@ -495,16 +493,10 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd, break; case SNDRV_PCM_TRIGGER_STOP: ret = rsnd_dai_call(stop, io, priv); - if (ret < 0) - goto dai_trigger_end; - ret = rsnd_dai_call(quit, io, priv); - if (ret < 0) - goto dai_trigger_end; + ret |= rsnd_dai_call(quit, io, priv); - ret = rsnd_platform_call(priv, dai, stop, ssi_id); - if (ret < 0) - goto dai_trigger_end; + ret |= rsnd_platform_call(priv, dai, stop, ssi_id); rsnd_dai_stream_quit(io); break;