From patchwork Wed Jan 5 10:16:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12704204 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 C2BE0C433FE for ; Wed, 5 Jan 2022 10:17:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=sq5PlIzqDPJUSG03hlA3DFff/jfpCxmWgGl15ZRbpAM=; b=lVHMQQQkoawE/c aqgtCH/LKLBrF9hU+qmZbFEUzA95d8Jh/IiecBLjsHrVYoGko/n1lkoP/anrpAt5JLk2erxzcczWl MD4LJiGCTLMCgEWmAOiApWxuLn/Q9YNd4sZAZMnckLB4Jp1rJeNLWi2rfJUA/CE87xRJQyk7IzOzw rK7rAlrnwgfAo1K5B+Vohpe+GWYgPCgb4rSqR2qTvSVsfDnu8x3hRUVMbZrh4YVgGlPJ69uz5xo0D +YmPDRcxWZ3Gi4QHrmYo+5vZmDOb4VteDnPzYy8QkJdoR8t5enOawCeXSTeF6kjZkmPvkWQPcaEXZ xV81cMfeKASfHn9W4/Zg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n53LI-00EUwN-TF; Wed, 05 Jan 2022 10:16:29 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n53LF-00EUv1-1s for linux-arm-kernel@lists.infradead.org; Wed, 05 Jan 2022 10:16:26 +0000 Received: by mail-pf1-x436.google.com with SMTP id c2so34797194pfc.1 for ; Wed, 05 Jan 2022 02:16:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=aJdy4Vc+2i7MVFq5AwmxIGlmluiA2uKFXYF4yxPWA3k=; b=m8i3JZa8/Qzk7foNf2srvzSS/UYiYgHXFUuMTKIsMO9diJn7tjVHXk9CQN6DtxIfhe r8ylwe+u/9YXo7T3upExqyAJ5R6iTQLOmy92bioX7VS27m69dO6DO8EnCFE0jH9oWHQi W5VNjqdKRChzbmteTOAJkAjOp42ZHMWMstfYdN0V8uDPnqpl9kEChpo2wQU9tVyzp/NY OWYGq2o4xc7czvdiWtDcqLgoXivT4AChq4M0YqOMi5RXOQ5sZ6CyhsZaVmJ8x1TWYS5S Irt6dVQbOOEFBP1he4J8TmYG55vpikU0pppjcLhzJUPVINMlvTvYA0L0cZd4cRqhqGD7 WF3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aJdy4Vc+2i7MVFq5AwmxIGlmluiA2uKFXYF4yxPWA3k=; b=cmcZIrPUBWpNQiufLwydpUyAGQHmZurPUAqJBQ4tVPv+gtMSdmFYYqWu2+zCAutDIM aa0VxN/xZRB1gLiLokN1ML4yqbemeIPM3Ew5JXgUf8qvJYsd8PVDw0Gz2ovcm+HDV95V +mwwRKJVj/ZUGO+tnKf9cI5234M2t9mInV4+AHjJPLz4J1lq7GTpijJS/xlXadjq0Iew kfb3qACx5QI3BPNqXe+V0ez0XHoY1XorCZ3BXFkK+OZwWFVJ86vdzNMqxxaAm+cZ4Oq1 pL9I3PIdXKgrlg2B3coMKiLh46fjMbNr40aXu6+x/0gXNXNFhGyOboKlQfdrNqnK80Wd hk/g== X-Gm-Message-State: AOAM531OL5AGz4wW7PHvVOeZTWn9EiXOY6hv0M+P+F7ztDs8PzDKbstz CJZKEQlcaiCiq7fnXEiOIVk= X-Google-Smtp-Source: ABdhPJxOXDyMm2E9v4ooUA8PevdQusz3K/Gvvk6H/GBdRD2sHCc8QDJKva4YpelLW/O5Fr+liNm0Zg== X-Received: by 2002:a63:3c5e:: with SMTP id i30mr1564473pgn.397.1641377784410; Wed, 05 Jan 2022 02:16:24 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id y27sm47044320pfa.12.2022.01.05.02.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 02:16:24 -0800 (PST) From: Miaoqian Lin To: Cc: linmq006@gmail.com, Rob Clark , Will Deacon , Robin Murphy , Joerg Roedel , iommu@lists.linux-foundation.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] iommu/arm-smmu: Add missing pm_runtime_disable() in qcom_iommu_device_probe Date: Wed, 5 Jan 2022 10:16:19 +0000 Message-Id: <20220105101619.29108-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220105_021625_148594_3468B8CD X-CRM114-Status: GOOD ( 12.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). Add missing pm_runtime_disable() for error handling. Signed-off-by: Miaoqian Lin --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index b91874cb6cf3..2f227bc88bd9 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -827,20 +827,20 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) ret = devm_of_platform_populate(dev); if (ret) { dev_err(dev, "Failed to populate iommu contexts\n"); - return ret; + goto err_pm_disable; } ret = iommu_device_sysfs_add(&qcom_iommu->iommu, dev, NULL, dev_name(dev)); if (ret) { dev_err(dev, "Failed to register iommu in sysfs\n"); - return ret; + goto err_pm_disable; } ret = iommu_device_register(&qcom_iommu->iommu, &qcom_iommu_ops, dev); if (ret) { dev_err(dev, "Failed to register iommu\n"); - return ret; + goto err_pm_disable; } bus_set_iommu(&platform_bus_type, &qcom_iommu_ops); @@ -852,6 +852,10 @@ static int qcom_iommu_device_probe(struct platform_device *pdev) } return 0; + +err_pm_disable: + pm_runtime_disable(dev); + return ret; } static int qcom_iommu_device_remove(struct platform_device *pdev)