From patchwork Tue May 10 07:45:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 9055001 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 B8A1FBF29F for ; Tue, 10 May 2016 07:45:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2CAE20114 for ; Tue, 10 May 2016 07:45:47 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 2227F200F2 for ; Tue, 10 May 2016 07:45:46 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8077F2654D4; Tue, 10 May 2016 09:45:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A90032651FC; Tue, 10 May 2016 09:45:35 +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 E7CA326523B; Tue, 10 May 2016 09:45:34 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0113.outbound.protection.outlook.com [157.56.111.113]) by alsa0.perex.cz (Postfix) with ESMTP id ABF9D261600 for ; Tue, 10 May 2016 09:45:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Nlv/xpwWKLi5JItqOIi5X4c5VBFlcy+XCZs2REsO8pM=; b=rzASpAbTlSA/mYM1g+QKb/vgXokhcHheuCj+2MkJdXRzJ54u4DWjsGNQ6EwOX2RURYgTxQwQWdjfiWhdmTtUw67K+27wUH6KeJ2fO34814No1FK+oRp0XawlpvYSbRamE6hZyIe58Nw5p2F5gML1Igg8xPSxPwarw3CUEi3zIZM= Received: from DM2PR03CA0009.namprd03.prod.outlook.com (10.141.96.19) by DM2PR0301MB0895.namprd03.prod.outlook.com (10.160.216.145) with Microsoft SMTP Server (TLS) id 15.1.492.11; Tue, 10 May 2016 07:45:27 +0000 Received: from BY2FFO11FD014.protection.gbl (2a01:111:f400:7c0c::115) by DM2PR03CA0009.outlook.office365.com (2a01:111:e400:2428::19) with Microsoft SMTP Server (TLS) id 15.1.492.11 via Frontend Transport; Tue, 10 May 2016 07:45:27 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; alsa-project.org; dkim=none (message not signed) header.d=none;alsa-project.org; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD014.mail.protection.outlook.com (10.1.14.76) with Microsoft SMTP Server (TLS) id 15.1.492.8 via Frontend Transport; Tue, 10 May 2016 07:45:23 +0000 Received: from audiosh1.ap.freescale.net (audiosh1.ap.freescale.net [10.192.241.229]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u4A7jKNB017414; Tue, 10 May 2016 00:45:21 -0700 From: Shengjiu Wang To: , Date: Tue, 10 May 2016 15:45:46 +0800 Message-ID: <1462866346-11878-1-git-send-email-shengjiu.wang@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(1060300003)(2980300002)(1110001)(1109001)(339900001)(596005)(189002)(199003)(9170700002)(606003)(50466002)(1220700001)(92566002)(575784001)(86362001)(50226002)(77096005)(2906002)(5001770100001)(48376002)(33646002)(6806005)(104016004)(50986999)(87936001)(8936002)(19580395003)(105606002)(85426001)(11100500001)(5008740100001)(229853001)(110436001)(106466001)(4326007)(47776003)(4290100001)(36756003)(19580405001)(81166005)(5003940100001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0895; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD014; 1:LpGssGY4gO5ZSKcJo3s66a+JAzRGGc1JIHV07oG/NFXq2VSaXjfgZhGGUbX3SF5i+yECtmv6coxkTgP1FwjN+vYCZkGuC6e1N2xKer7j60zG6/qxUReetVIZj90K4vIULd1iM5aQfxP+E3ST+Esj6Mq0ZwZG3O9y8i11mnMaS/ecLd9z/NSf7rf5iJZ8elz2B1dVc5zAqAiSJvo5STeceUet7gZd0IGLexHt8looJybtiSJI/d4YLZycKYy5JwXDECaxhxxjAEQM1whTwVHz51Fg0NvWRWCfjAkFs1dQszHuIJi4ltUXkTd7HB78GOlo2LyXZGwJn9vjEzjOjCXj1dDBmWIiLa5fdrOwNbk910R5ANq+Iu5gG3vWbsPcmnUBQqNr9gpJK/LZyVEgiB/0BPJjAU0J7/i4bvWrf/np7Zyvp6InNIrUfdGi2p7PWva/c9FhByD36/Y8Suirh9FkewKY1PEqr4C0blge92RmjcYdGpeh4R9fHDqDi6I9cP1R9aUFNTQ2pl/fNVGsKguAXaNcyVlWFrsm+KxJVxq3B9NHkyq+9SgpFBdEqC1x38OA MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 79f58b1a-3c65-48c5-5306-08d378a70cde X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0895; 2:hVI2ai5S8rKJPdaqAJqX8DLT5Gm8YuXIk6yTwa+duo/r5fxC/2+jP1Fbz856o1OEhjYZSr96JrsDv5BTIX+3tjg2w0O+47QGVucyAS+V6SiskjsnCtlalDurMezoxe7WZSkn5jLPjYl437188nqxmrvZY+hRTcCPja2n3oQcGrMfzDkRA6W7aXWfXKrHJdIi; 3:DJjRqNgLdxDUx9/iysQzfl63mwXVDpFWEgN83nsvQ6KhNJHuNdEsFI+l3xNN6jrOcAM02ZSphdSueD5I6o+BogjkSprunFj67+uTJoJQLjJCUPQucK0AfDJjp0p5Cs4YZNHbANr+hJdp3QDEmGrlSZvweJ541svCfTaGbBKmqGUzHKlVAl99v2/PpObx00gddUErnReQPYMI/bs5CbxyXlQwlj+rcITbmrljLS8dAl8=; 25:bFCos6hs09S5l8rdiz4gYE8pIp7Bns3uQoQn2Z5bF2lE5QvJW4Luff0c2FvQTUd5TQCadmABhbIo84CyUWk9yINj/K+JOKtd+S7fmCWXjPagsSwaoScCMMwNsBzQbAec8NgsIDWbW/KOBhn4QKxo1g70zn3aGQ6V+w7atEsur1T3adua49km1EX2lfi2BhIYAVfmdMHNaqoOmhKXURF1AhJgOJqHrQsldgBzqc9iq5Fv9YJr1y2v+bL1GpCLnoCTFJniHq10dsfYbLBLBopp9fEfqPAXs0mUUaIvDPwh/FUFsboqib4yQYBi7HhvBP/y/04HwVPfjMSANozDZGRUw1y3CvE67qpFvnqyqj5xM4oYBmvgIbb2XOPrBD42eKovCy3pW4LlpiFIA2JI0z4VlVDCut09jZHr6BQYcNfUiOOKmQyCh2rlFmI7ONKfMOL+ X-Microsoft-Antispam: UriScan:;BCL:1;PCL:0;RULEID:;SRVR:DM2PR0301MB0895; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0895; 20:wWgF1UzaIVs3gWDEApNnCVE1oVpij2NVOufUMDouoUDoKmeoNAlk5a7uWWP83abW4UthdQK8TAHGL0QrTtWdH6FkRbbK4v/LOPJxkuoBRN0q3EcoQbrLi3oCSVi51cqXQSGUtOZM2tWmucZTLMA/OGPqkMbM1i7QAyVvm2fIvsCMElaLF/eUYdYAvl5slA06ws72b879LS7MOqWNlEsZDHqnf5b5zIXo17B1Q0TxI2Kw1L1GV0BQj2u+XSYOxAEdhGNIy5e7sG6Mo5OyMyFz4f46K9SFfk/zzCzso5oE/7wJRi98hIfolcNq7/izs0GqjiN+D6+53ja8pZSHrHyl5LH0n48fx0u2sawI3ac261i3NrYYLtqnTTPqV6GJiisovrFzT3w4N7VUH2oO1F3mvJUdbZA05/DwTpQ+M5ytUFHy/fKepdXVio+QeM8Po1OOvsFIonZr20aqDiWMfeCLiaACAe7av+jdbXIRPoudE5z/ciV3aTAXHBKY2U4kMMUEBcGHUfRTbk/ueNsBSeYWhZZCmC1UjYZ1lOfAW/aBJeiNgPOXimMzycuLDvBPmamUjrXgFU6VrX1HD7XJgkxwrlE6L+T4lmerVgLJTdtwU3c= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:1; PCL:0; RULEID:(601004)(2401047)(13017025)(1201001)(8121501046)(5005006)(13024025)(13023025)(13015025)(13018025)(10201501046)(3002001)(6055026); SRVR:DM2PR0301MB0895; BCL:1; PCL:0; RULEID:; SRVR:DM2PR0301MB0895; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0895; 4:YdVxHsmAcDGSGiFKuSbuur5kVFDlU5YhKsSEfU8btzVeCDf5b1AOQkeO+WbhYupFr+nFkJ9H/4dfJJf+UMX+43WKfBbxUcPbXOh2aWQvj6+NaciQT0JEIxpib4IGS/U8qcAccEkTvFC88pOxIpkCeMCSCTLBeFpnFqeXG9R0jG0tY7LDvUnqfJwy8AK5VYXjDFj7Y/4FeFvKUyIdztbcvhZyf77mW1kvgDhqyGsq41moS78qEvKFKLu1pdNw4VuJvxooGo/XekLdpZyUv/KRXeaq+2Py21C5BzpfN2J0ADq74uBKIu2IYgODqb1fKLZU+LsYfbWC/Zf/Ka2VgUvFXJcIfUrCukchTdA0Rf1PUAE4C+99ApfbCAc7EjBxUKlolPtB8Ch2nFwHW3GIVsiQeax0jc0V0prDcP4ksvuYfHjeKsk/DJ58KgzVHWvKzn/ZoBJxANZW4t/A2VFdi3V0TCVAHGy1En4gNQ0D9fIshIcdvrMwFXAdOEcw6pYdR9SQ X-Forefront-PRVS: 0938781D02 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0895; 23:A+zgp/kucUie9msuB+LVMfwZEKN0VPR7/27pxGf?= =?us-ascii?Q?WP4QezlY0Anvwv1ga9Ypx+AUMFszyaH/eLo1DB2j2GlGG04cnvqDRdjX8eut?= =?us-ascii?Q?w/zsBhKfKGlfGsn55MJeq91uWbouP3ccYsojmL7pS2gIAJt25LnfAyNzctq6?= =?us-ascii?Q?HwgsoJ+sSEBh2IzeeDOzLnPgvSthTnMQjBCrtYSO/N6ovsYTgUXw/xbHlREJ?= =?us-ascii?Q?mY7LG+R5EiYRvo5xZNhm8nV7z9DWr+V470Mk0/X2m9hNNbbSs5MBQmdkMt1p?= =?us-ascii?Q?Zk8klC8UNo8WzPvuzp7YEcahM0jy3lYqjjlBgnARCgzYafa36xA04tk+3p2/?= =?us-ascii?Q?Wna9OnvWWcZFwOdq6JEKsQYku0bq1fBLOtqS7lQD18zy/l17g3KZ/C+BOH6j?= =?us-ascii?Q?YXMKeZWwGjC0mFnQlYAXAMLz91lUkF7GBiWp2JQT6Dw/gwuAjB717LMrm9Zw?= =?us-ascii?Q?Ou98BE+Uj0ZLCD/l7gAnYahDi6yPPfHIo4PBXgdVukI/OulmD4A+J0xnK6Nv?= =?us-ascii?Q?dM8yGY9yfXLu9LTuJF0sryCwFatjqHmphZsVZ4w0Q+1ACXknT3Jnby+aluKw?= =?us-ascii?Q?UIL9h3OIxz6Hz4qB0t2qM/0wBH2jbAP+BWdpIE2Hvu6rgpQhr7OQNfaMRBt5?= =?us-ascii?Q?J1NIs6a+YmwqIK2Y6bbUBof+ufbWVozO8ifqQrSpmpsPjY8p5ZO8fa3ziiPO?= =?us-ascii?Q?51Y2+FWje+fB0r1ShMhWL12RGj8EXXNI5gHDn+PEs4gofVDEM4uFCXSzdT6t?= =?us-ascii?Q?3fMAZWdDeNRTGAT+b6SurqXDnhBR+G2xgGy7bGMvbywMncqzFYyyPEjyT0Qj?= =?us-ascii?Q?69vwDsQ1Xt/YfhH4Go3jGqgcDKzb5MIWbbC2OB93rzQk//Gm/Lh5fou6ZDG7?= =?us-ascii?Q?zVvp0qFub9M7+rnYP5bdNjNlGLt5ulKYs/17vgJzD8a+R/fRRV9ZZqqKqoCB?= =?us-ascii?Q?PlCEMltsGQ1LFByEzp6mdOJ+rVX2Q+I6JTgiECPWr/MyzzcdZ5g2UOqIi7Bn?= =?us-ascii?Q?TuJvszK1H/7zeCM1HoTBTWk4pk9Eg4W8Er9MjGx5NRwGFLgeuXnXdNNRW+NR?= =?us-ascii?Q?jp1g+8B8+/GLMISytDudntNYHRDlitl3vbxMKMSvpziMhymaGsg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0895; 5:rtaKsKPY/ZF6e0m6xoP/olo8495lGZt+PSNzyKBnRU3GN70RD+yeGEgHklY0KnwyeEcvn32bzIGfmDkFBnJ54UxYBUW0PMJeNmBqwvUH2HRsaaoaBtDlUMswHFHlUQZjAjau8xyx/JwM3EvZB7suAg==; 24:5iOQkmkXWQY/DJt5kVWyGzkAcmGAsZRbD+L3ymfVFmse9qHGIRJXsy1bmu1OcqYv4F1KQuIjw3m6bf7Dh34e3ruqNqXvGbC9tnm2fuSJMjY=; 7:IPqvHWlbLiIk7Fre9AGTBg/Uj447OwihN/WXC2YyF+rS6DtltvYZFDGZEZdhPb190bWjj3WhwSwXiRa1FfnO9WMvf39CIqg5wS//Aa/bSuzTH0KJHAc6GO/aICbamTKrxmeOAlgaNJIbJBLbXN+hQCrYD8/UPl0YyK6kf6VIjM8NongkWIBKAp4tUzpKrhLL SpamDiagnosticOutput: 1:5 SpamDiagnosticMetadata: 1 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2016 07:45:23.5180 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0895 Cc: alsa-devel@alsa-project.org Subject: [alsa-devel] [PATCH] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED 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 The resume function don't update the dmix->state, if store SUSPENDED state in snd_pcm_dmix_state, the write function after resume will return error -ESTRPIPE, because the snd_pcm_write_areas() will check the state of the pcm device. This patch remove the store SND_PCM_STATE_SUSPENDED state operation for dmix,dshare,dsnoop. Signed-off-by: Shengjiu Wang --- src/pcm/pcm_dmix.c | 2 +- src/pcm/pcm_dshare.c | 2 +- src/pcm/pcm_dsnoop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 007d356..66bb288 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -451,9 +451,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) state = snd_pcm_state(dmix->spcm); switch (state) { case SND_PCM_STATE_XRUN: - case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_DISCONNECTED: dmix->state = state; + case SND_PCM_STATE_SUSPENDED: return state; default: break; diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index adb3587..a133c72 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -241,9 +241,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) state = snd_pcm_state(dshare->spcm); switch (state) { case SND_PCM_STATE_XRUN: - case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_DISCONNECTED: dshare->state = state; + case SND_PCM_STATE_SUSPENDED: return state; default: break; diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 8ff0ba5..d56dd97 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -205,9 +205,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) state = snd_pcm_state(dsnoop->spcm); switch (state) { case SND_PCM_STATE_XRUN: - case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_DISCONNECTED: dsnoop->state = state; + case SND_PCM_STATE_SUSPENDED: return state; default: break;