From patchwork Mon Jul 12 06:12:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473057 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2717416jao; Mon, 12 Jul 2021 01:16:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmT/FYT2Y2CGkEK2SvpbbqGfQKtUZFU5sgPlxFD70o2X5uPZk2wj4grNTzi03JH6L6lsPT X-Received: by 2002:a17:907:212f:: with SMTP id qo15mr11958078ejb.400.1626077763161; Mon, 12 Jul 2021 01:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077763; cv=none; d=google.com; s=arc-20160816; b=gx5yIBVb9QvvzNj2DsAvWBac3eFtEpWYe3Dd9ys8vXwi/rjzV80LeNRwNSenqPFwcC Ud38Kn1Vk1yQ0Vn8CDnbM25J+Nc2Cy3nAsGxGrSp4a67Bi4nxF3mokOkQDprCIPJROJ6 Sww8uC6MrOfFfLXZJjVPYMrfBNdZLnOVzahPEYM0clvy8BiHFcJwVQ+eJcAaSvtFFldK BG5hv2aD/N78/VLpMHNIF2K+VyQOdwfmxZJwKgpjLgjlJkG9h82ziyJfE5rZg+2pOwXv 48YbYifXpk5lqXF2MBXVd7yjqUbhXESieKQViLW5kphP16YRZ4XdHKoa2mfjgQBjIZSm dbfg== 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=wRE/sUq06qTVM9DsbL3vhGkNRWj7DHyxm0nrMUNxUY0=; b=kuycwdwP8filmVvKnaaWkBZ+I0oaxl913hQ+lYoF59FAEHGRJoeAXHRslAnewxIbyy FbV1/0BaNbec5l0rTxggRqrLAFbEyeYUBozeo433f/f/sIfk/++pIeQouk2rAOKFOncB oK5S3A4ipojejWBfaPBaCsMDLcWJgadZu6LXL5kXYWuhm8Mu1+kH5WA1GW/kloowVBi4 LwYyF/+QYtl/fkrr0qTN2umLKTvUNkLvKwd17cmacFFQrk63TfTUQ5RUMAh0d5Cn7TNv SkmfguxEmJ+Z2KP832A82VRMY6qjRl5lSfqBHGRHGtHxsogbe0AW/VCBQ1ihT83/bveQ UTRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DUjBxeed; 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 n21si13642925eda.13.2021.07.12.01.16.02; Mon, 12 Jul 2021 01:16:03 -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=DUjBxeed; 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 S230297AbhGLIKm (ORCPT + 12 others); Mon, 12 Jul 2021 04:10:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:55672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353703AbhGLICr (ORCPT ); Mon, 12 Jul 2021 04:02:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D9BD16142F; Mon, 12 Jul 2021 07:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076603; bh=6goBKYCxXDesPc88ecFa8J1E8KMZ+jhFDyRaPcWVJ18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DUjBxeedlzmoQGF88Lcwf7lszEzhluLitnFv6BsQRarpqmXlanmoilzVnoG7ZZEg9 l3fRCmavdhOt2Lh4a6OWDW5fCJNiL35sxp0ae3PRoKgKjy8k9PTfLwYeZGxK3Zb0fV 4mo5+1C8ma9a2IwlcwuCqH73Wf8vMNXL3zu0BHkY= 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.13 715/800] ASoC: fsl_spdif: Fix error handler with pm_runtime_enable Date: Mon, 12 Jul 2021 08:12:18 +0200 Message-Id: <20210712061042.823613200@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 c631de325a6e..5636837eb511 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -1375,16 +1375,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) { @@ -1487,6 +1500,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);