From patchwork Thu Mar 16 01:30:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bard Liao X-Patchwork-Id: 70533 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp220844wrt; Wed, 15 Mar 2023 18:19:39 -0700 (PDT) X-Google-Smtp-Source: AK7set8cejcktub90Z97JQTZpD6a1Cp7xPTbtDZrmtBXxfqK3u7cwlfYGcqhn3v1UIVgH7UwO4Mw X-Received: by 2002:a05:6a20:258b:b0:d6:cd1b:4594 with SMTP id k11-20020a056a20258b00b000d6cd1b4594mr1352696pzd.48.1678929578995; Wed, 15 Mar 2023 18:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678929578; cv=none; d=google.com; s=arc-20160816; b=ccb4EGFO1Hhjha+4/DIjki0UvlTmImGfp69B6KrhS27HHlUgbslJul3Apsbr9jl/JJ vueqZbgsy/oPQmbFb9TD3ce+toIuHwUcd0BmWg6bHkMfEXwOYMMboDmdZQkjiI+TRDne tiUNxYMhTL8ZM48FMwK8gzl29z6pCEAsxZJ6T3FCx4ZNEXJZmNAbsYVmUvZDMaIhfZLs pbHJl92Qb2lfb5liLMounsDumFCe4plKPiKnKUUysKExktWNHmFpcwzOPVxRtVe9J+ph bEWfKi6X0KRLvvT4bKWqzSa0nURCi4efBwtp7lXDdiKXt4PF9ZRS5nAI9mXNy47QObK5 LBlA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=01sDaRUkSF7DKMCAeW0fSKLPUVgJtObOlLgsdOI20Dk=; b=JcJfNN1emv1RLvo7wAlQVH3htgco5qSM+n5CO1Gw9N9pGufPyAzu29Mk/oATGNZSh5 mS29rnmvAlBv2NA3wJRXDSXk0ZUWcLEGvhkSRMI/Hht7wk1Ru5AwnWXUPfP+QdbApDiG uoF1RXBiTMT8QWy5oKvsShTdyFKVkfpIA2zl/a6+3Oh9i+DR4ytOj/T8teZouxIRFr2U Uzk1eUg4na2nEHu9nRN0iOeD9XZNjK8UgIK61Maih84iWCj5t/1+AceqSRONAmamSdGi qVFFkucz9UrpRNEi8FQdT6Kgf716zp5ktbziAJDGBGY7dQg7dqJugTt2XEvE2i1zloCX 5Cig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=iilkL7BG; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y7-20020a623207000000b005a8a1ea9ab9si6163462pfy.370.2023.03.15.18.19.23; Wed, 15 Mar 2023 18:19:38 -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=@intel.com header.s=Intel header.b=iilkL7BG; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229560AbjCPBQU (ORCPT + 99 others); Wed, 15 Mar 2023 21:16:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229487AbjCPBQT (ORCPT ); Wed, 15 Mar 2023 21:16:19 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDF6135241 for ; Wed, 15 Mar 2023 18:16:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678929378; x=1710465378; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=mruBbeYEYvS76q1If3LbzUoj9KfnmiBSODHrmLNTmvM=; b=iilkL7BGtT74+gVd2fCte5Gcyr2ay5q21uHDaH8N1dl8i+NigrVukcXQ sbliYd4wVFWPGFmFnfQ9yYD3wxxrDpDYDvuQskbVQ8i5Us6x+B1xbkOTj ZdX6er1suIkuANO28Wgh9MpwXAh2AVXmrJKZbLzr08DkWIiaIV1k1k/h5 oNiA2BgkkAnyfDGS8dz8b8FjT+x+z5SdDOrGRZ59MpH/uRZRmkTf3+7O6 E7XjHQqm5ZXGypXDLCadtShz0TUsKuHAzpP2Nb/TXJe4HHFIUzWrcdHgB TPAdxjHqbEBNf8PeV2qWoNW0crOYj5fEIgTw+THFKHPvExXmet1H417xj A==; X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="340224484" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="340224484" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 18:16:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="925547207" X-IronPort-AV: E=Sophos;i="5.98,262,1673942400"; d="scan'208";a="925547207" Received: from bard-ubuntu.sh.intel.com ([10.239.185.57]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 18:16:14 -0700 From: Bard Liao To: alsa-devel@alsa-project.org, vkoul@kernel.org Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org, pierre-louis.bossart@linux.intel.com, bard.liao@intel.com Subject: [PATCH] soundwire: stream: restore cumulative bus bandwidth when compute_params callback failed Date: Thu, 16 Mar 2023 09:30:41 +0800 Message-Id: <20230316013041.1008003-1-yung-chuan.liao@linux.intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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?1760485262048025376?= X-GMAIL-MSGID: =?utf-8?q?1760485262048025376?= From: Shuming Fan The _sdw_prepare_stream function just returns the error code when compute_params callback failed. The cumulative bus bandwidth will keep the value and won't be decreased by sdw_deprepare_stream function. We should restore the value of cumulative bus bandwidth when compute_params callback failed. Signed-off-by: Shuming Fan Reviewed-by: Paul Olaru Reviewed-by: Rander Wang Reviewed-by: Pierre-Louis Bossart Signed-off-by: Bard Liao --- drivers/soundwire/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 8c6da1739e3d..136b6850a3f0 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1369,7 +1369,7 @@ static int _sdw_prepare_stream(struct sdw_stream_runtime *stream, if (ret < 0) { dev_err(bus->dev, "Compute params failed: %d\n", ret); - return ret; + goto restore_params; } }