From patchwork Fri Sep 15 12:40:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 13387021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F36BEE6457 for ; Fri, 15 Sep 2023 12:42:59 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 234D5DEF; Fri, 15 Sep 2023 14:42:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 234D5DEF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694781777; bh=wjTnUecFMHY60czI9aK2gYJcFw8a7fWEbC9CHw8DHF0=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=KoMrOdxWByLgvdlFMIV8zanwMHVai6UodNbQlA0CsuE1vjnv4nLGfIIf1JYnwxpG9 baEmOc8JDT0XXDPsCKiyz37NkQN/ah0f/iTsHbbwZKBXXtlu3vhxLVb9oykYGlxtqg 5E+nNSQoxCIOuMFxHV+5dCj22lNVCSuLDo2dN3go= Received: by alsa1.perex.cz (Postfix, from userid 50401) id E78F7F805B4; Fri, 15 Sep 2023 14:40:40 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1295FF805B4; Fri, 15 Sep 2023 14:40:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2D382F80570; Fri, 15 Sep 2023 14:40:32 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0AD0AF80431 for ; Fri, 15 Sep 2023 14:40:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0AD0AF80431 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=nEFMvwz3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694781619; x=1726317619; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=wjTnUecFMHY60czI9aK2gYJcFw8a7fWEbC9CHw8DHF0=; b=nEFMvwz31OeICFJwqR+sdiX8n6r+bfuymx0gqeZvFMzb/ToyAI3afOCQ d9FL2GykBqRa+cDyuV0ReUD9DL8XPXktSygmSLP/RUIKCXdyHOrRmv5Xl 7TD+E3IrLY0x3lcEMFb6I735EtIVu0+c07Oz70X3azJFugjqD3EmSt1HS tHJMC+PdHxzt+5JZTMKEpjL+yNIs9CPvM2YFK7vBEN5G1Xrsg0DDNf+om 4EDSqNslavRAnBs4J/4ndAUQACufXusVhagRzmZRamzkbXkSwDlazla7V cmsJKUZkwBOUB1rHodfvFDgBd6TQ/HWfbsEe3ljYmew4G69B47IEyxiWX A==; X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="465601064" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="465601064" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 05:40:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10834"; a="815161610" X-IronPort-AV: E=Sophos;i="6.02,149,1688454000"; d="scan'208";a="815161610" Received: from brhacker-mobl26.amr.corp.intel.com (HELO pujfalus-desk.ger.corp.intel.com) ([10.252.48.34]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Sep 2023 05:40:09 -0700 From: Peter Ujfalusi To: lgirdwood@gmail.com, broonie@kernel.org Cc: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com, yung-chuan.liao@linux.intel.com, rander.wang@intel.com Subject: [PATCH] ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful Date: Fri, 15 Sep 2023 15:40:15 +0300 Message-ID: <20230915124015.19637-1-peter.ujfalusi@linux.intel.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Message-ID-Hash: KPZ7JYUADN4QFFVAQDG7BT7BBOFAIGWM X-Message-ID-Hash: KPZ7JYUADN4QFFVAQDG7BT7BBOFAIGWM X-MailFrom: peter.ujfalusi@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: <> List-Archive: <> List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: All the fail paths during probe will free up the ops, on remove we should only free it if the probe was successful. Fixes: bc433fd76fae ("ASoC: SOF: Add ops_free") Signed-off-by: Peter Ujfalusi Reviewed-by: Bard Liao Reviewed-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Reviewed-by: Rander Wang --- sound/soc/sof/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c index 30db685cc5f4..2d1616b81485 100644 --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -486,10 +486,9 @@ int snd_sof_device_remove(struct device *dev) snd_sof_ipc_free(sdev); snd_sof_free_debug(sdev); snd_sof_remove(sdev); + sof_ops_free(sdev); } - sof_ops_free(sdev); - /* release firmware */ snd_sof_fw_unload(sdev);