From patchwork Mon Oct 24 11:26:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478087wru; Mon, 24 Oct 2022 07:16:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ZPjhl1RbmhTfQ3CKfExjkU10PsZf2X0OZe0aBBvLMu0GjPhB3T6HMfHnx5qP85jMub0MR X-Received: by 2002:a17:906:cc5b:b0:7a9:e58d:bad9 with SMTP id mm27-20020a170906cc5b00b007a9e58dbad9mr2703677ejb.237.1666621010226; Mon, 24 Oct 2022 07:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621010; cv=none; d=google.com; s=arc-20160816; b=UxZ/UJKU45/do2t+lWPKW/ojt/cGL1AS1J9uR2HSGm4J3FgrzwkhLaLTaSkIroPcHc vZd8seYwrpkCmERckFNjrbLnjwp9sM1q/90wgwgMKcLbUCvZn5OC8FnE8ZckUaCgBN3U GycCIjUC4zp3QwWc8kOCbpTzY4mq1EvEu1hbVn8dMco9fVNRV65wnQxwgHQif82+7HB5 wLa15havGqZC6MWXGU9v8D/DOeYS3Pv3O74yQTxI0Bmy3A6UxwdpNE26CRrGN8D7KmaU HLET+97VUnG7nA9QxuJPFYym8XLZnyzntpUA4BEN0HeBRukmKNUZWXZUkPpjZXkh9jFQ 4VPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DYFMkEqEuQPqiZTlOVkacocWot7TykaL0hyRUIMhThw=; b=dfBTLezcMQaP47V9lnho0NsoE73VFvaPDFyRx3iWUN65VlWtBlyuq9HvcHG0IFWwmx Z+RH/OhWAREi+WlVRYQXpbpUD9DBBwdE1MagZ8Rqn3ayOTCIVYbuXI/38FgmNGmz1hJy zGGp1A3HTkUhwMFNGq4K2kc8VEYWS31aqL5hQ08a5aZg4cH9quZsVaC0yo95F8ul+VJG /8flsNKCjXf90rXoWYhu2pZsJgVQXsRwSfSfbUzeDN/daFFu0x5X6yScAGe1sEnXD0eg Jwe3vL+P0n27/rNnK2IBGc8On/XgGtgEitGWXKqsdhFL/n3hHq96tvg0LxmESz632fw4 PC5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bktuswqU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k4-20020a50cb84000000b00453688643fasi24941590edi.260.2022.10.24.07.16.26; Mon, 24 Oct 2022 07:16:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bktuswqU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234530AbiJXOGS (ORCPT + 99 others); Mon, 24 Oct 2022 10:06:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235158AbiJXOCs (ORCPT ); Mon, 24 Oct 2022 10:02:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2D3164F1; Mon, 24 Oct 2022 05:48:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CC32F6125D; Mon, 24 Oct 2022 12:35:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF7B1C433D6; Mon, 24 Oct 2022 12:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614949; bh=QISEug/oQPt/cNqoDbsduIJCybvN/wr90v+7N9BYJUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bktuswqUKIfnvBFNUJ/5/YxTfxNENJswqn55nU+OGQQAINWbmkd24hKJtdiho1Q1+ JwqirVZ+teB57OKZkxdcCAEUluf/UQQifQMrLMmob8JIx5hFhcz5cZwqRdNS7dlYsH Xr0F/4lRLfSXbbjHUJwNA4qqoG9C9BwghKVoyA0o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Krzysztof Kozlowski , Srinivas Kandagatla , Mark Brown Subject: [PATCH 5.15 034/530] ASoC: wcd934x: fix order of Slimbus unprepare/disable Date: Mon, 24 Oct 2022 13:26:18 +0200 Message-Id: <20221024113046.541024158@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747578792621955145?= X-GMAIL-MSGID: =?utf-8?q?1747578792621955145?= From: Krzysztof Kozlowski commit e96bca7eaa5747633ec638b065630ff83728982a upstream. Slimbus streams are first prepared and then enabled, so the cleanup path should reverse it. The unprepare sets stream->num_ports to 0 and frees the stream->ports. Calling disable after unprepare was not really effective (channels was not deactivated) and could lead to further issues due to making transfers on unprepared stream. Fixes: a61f3b4f476e ("ASoC: wcd934x: add support to wcd9340/wcd9341 codec") Cc: Signed-off-by: Krzysztof Kozlowski Reviewed-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20220921145354.1683791-2-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/codecs/wcd934x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -1913,8 +1913,8 @@ static int wcd934x_trigger(struct snd_pc case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - slim_stream_unprepare(dai_data->sruntime); slim_stream_disable(dai_data->sruntime); + slim_stream_unprepare(dai_data->sruntime); break; default: break;