From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEF70C352A3 for ; Mon, 10 Feb 2020 12:43:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB87B2051A for ; Mon, 10 Feb 2020 12:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338626; bh=m6cwZzCh2LI5USGwyzzuiZR9EePHbRQEa9N2N2+tT1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v/UNu/lVZ5m5JJGykZ9C7S0iYa5WR4LxhBkF5tDJuvaisCJsPrrHQTj5heM08fgZ8 oUo8MFmqOMDxEl3rNXXKLgzZE1Uz95VyI4TADNi6bQR5DSjBhzN77ZpO22w3lhzpmj LZKw+ip9YDKef0JfqYhahakKQx5H5acJ/V8crU/w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730306AbgBJMnp (ORCPT ); Mon, 10 Feb 2020 07:43:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:39416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729622AbgBJMkH (ORCPT ); Mon, 10 Feb 2020 07:40:07 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 87D8B208C4; Mon, 10 Feb 2020 12:40:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338406; bh=m6cwZzCh2LI5USGwyzzuiZR9EePHbRQEa9N2N2+tT1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n+Irx/hEDRsY6bIaOjB2TUL3tEy+FbMfMrqBEv21PpSBCVPXl7PDiK7Ug62Siyw+V nh/RedVvBkQF/hE81umt7X+qUFQllOTdS5oXnxzi+S9hldoXyBXRqxvxNSO9zj+72K 78oGd+c2NpAsfTXeJEvFSL0ewf6m7JHbewPBy8m0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai Vehmanen , Pierre-Louis Bossart , Mark Brown Subject: [PATCH 5.5 109/367] ASoC: SOF: core: free trace on errors Date: Mon, 10 Feb 2020 04:30:22 -0800 Message-Id: <20200210122434.504307647@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pierre-Louis Bossart commit 37e97e6faeabda405d0c4319f8419dcc3da14b2b upstream. free_trace() is not called on probe errors, fix Reviewed-by: Kai Vehmanen Signed-off-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200124213625.30186-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- sound/soc/sof/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/sound/soc/sof/core.c +++ b/sound/soc/sof/core.c @@ -394,7 +394,7 @@ static int sof_probe_continue(struct snd if (ret < 0) { dev_err(sdev->dev, "error: failed to register DSP DAI driver %d\n", ret); - goto fw_run_err; + goto fw_trace_err; } drv_name = plat_data->machine->drv_name; @@ -408,7 +408,7 @@ static int sof_probe_continue(struct snd if (IS_ERR(plat_data->pdev_mach)) { ret = PTR_ERR(plat_data->pdev_mach); - goto fw_run_err; + goto fw_trace_err; } dev_dbg(sdev->dev, "created machine %s\n", @@ -420,6 +420,8 @@ static int sof_probe_continue(struct snd return 0; #if !IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) +fw_trace_err: + snd_sof_free_trace(sdev); fw_run_err: snd_sof_fw_unload(sdev); fw_load_err: @@ -437,6 +439,7 @@ dbg_err: * snd_sof_device_remove() when the PCI/ACPI device is removed */ +fw_trace_err: fw_run_err: fw_load_err: ipc_err: