From patchwork Mon Jul 12 06:11:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472939 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2664496jao; Sun, 11 Jul 2021 23:56:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvf8yrO3y4SCQg27b55wAp3Enf7DBUpqeOuqeZKvCozjAHSe3Ca2NiamDfzZwFgUx37SDu X-Received: by 2002:aa7:d457:: with SMTP id q23mr39593738edr.324.1626072679392; Sun, 11 Jul 2021 23:51:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072679; cv=none; d=google.com; s=arc-20160816; b=DGfT0Favuc0iZQqk5RMpyevuuWmMfzUnG7Mh16uiwhD529lpCOua6ARAHdhro/P/Ce vvHS2O5s5xR32q9ddm2QPczjuMlxEfKW7mTR+q+xKaa0yFTiQ+RlLoFvMWBLlx7RCzbx u4Q2sU4e9LaGLSStHNcwZu9hGRvLHP3Bmt4Hv5Xj5Rr8VcrTrn3DXc2YV7uZrFZ9CX3n IjceBcsb++u/qSidw7/jAlt7UPITXDamtOwQiNVMd8TAraUoMl5gkWWUvcbfzXC3jMWy YteTc0rTS6gUlrxGIuhMZR9RjVddDpqw7UByPn4LPdgaPyDh6fqQ4Pz+ii24TpOWLof2 21DA== 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=xEY9o3n+XCrIPIYN47IOrLe53omKHzT/eF7y+B/A/zk=; b=cDidufvhto5pFDr1rK8ah5Fipcy1kTyPYotqJ/f1tuuQwaFUel6ybi8nR986psFIoU Kzu1iRu6ifI9icIxLQ9p1jvNqivc9H+F8i4KDxtuC/c3UZNqx7P1WIVJZciW2iO1acVJ J0kcB0tugagCzwgyjGb7eqCYQYSq+Q+hZY10wF1ToBSaREfvwnmw39hn7ByWZtIF5XZK KKXVy70yTQd4GUtFjF6qR0pdN1RMl50zaqgDzgmW+XGaBiKO2FNryJW5sOjoyVeJQ/xg m95vanKIUY0KpGflY+7GMxa6F7/vz6dJSZk+Q+7++FSld/4rtaYoIxqPY7A3+fhI2c4p Gmww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wln3ebHe; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r25si3440466edp.437.2021.07.11.23.51.19; Sun, 11 Jul 2021 23:51:19 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wln3ebHe; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S240290AbhGLGx0 (ORCPT + 12 others); Mon, 12 Jul 2021 02:53:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:51436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240751AbhGLGwK (ORCPT ); Mon, 12 Jul 2021 02:52:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 438BD60FE3; Mon, 12 Jul 2021 06:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072560; bh=qGnIMxTlyW37AFv9vA1hjkpK0wuINS+XfDTYg+/xTZs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wln3ebHe2iPGeWot9/gJQD7DopRb0pfmiQ9V7BeryDi2fCy+Dp1smksL1dWdBuvnp WCStFiHDycITDs3mvf0o/ura7Nv5zqXvOh+jzE/ihXUuqW8DxzOCYz/PjiZqZGM5JD oF17bAUqdTCRKOprqh4AtcSCFL6IlpBDadU3fvXI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Mark Brown , Sasha Levin Subject: [PATCH 5.10 521/593] ASoC: fsl_spdif: Fix error handler with pm_runtime_enable Date: Mon, 12 Jul 2021 08:11:21 +0200 Message-Id: <20210712060949.972787526@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shengjiu Wang [ Upstream commit 28108d71ee11a7232e1102effab3361049dcd3b8 ] There is error message when defer probe happens: fsl-spdif-dai 2dab0000.spdif: Unbalanced pm_runtime_enable! Fix the error handler with pm_runtime_enable and add fsl_spdif_remove() for pm_runtime_disable. Fixes: 9cb2b3796e08 ("ASoC: fsl_spdif: Add pm runtime function") Signed-off-by: Shengjiu Wang Link: https://lore.kernel.org/r/1623392318-26304-1-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_spdif.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index b0f643fefe1e..1fbc6d780700 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1358,16 +1358,29 @@ static int fsl_spdif_probe(struct platform_device *pdev) &spdif_priv->cpu_dai_drv, 1); if (ret) { dev_err(&pdev->dev, "failed to register DAI: %d\n", ret); - return ret; + goto err_pm_disable; } ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret); + if (ret) { + dev_err_probe(&pdev->dev, ret, "imx_pcm_dma_init failed\n"); + goto err_pm_disable; + } + + return ret; +err_pm_disable: + pm_runtime_disable(&pdev->dev); return ret; } +static int fsl_spdif_remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + + return 0; +} + #ifdef CONFIG_PM static int fsl_spdif_runtime_suspend(struct device *dev) { @@ -1469,6 +1482,7 @@ static struct platform_driver fsl_spdif_driver = { .pm = &fsl_spdif_pm, }, .probe = fsl_spdif_probe, + .remove = fsl_spdif_remove, }; module_platform_driver(fsl_spdif_driver);