From patchwork Mon Mar 7 07:52:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12771319 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 A2925C433F5 for ; Mon, 7 Mar 2022 07:53:56 +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=qztMKHBAwZwMXi2rsZO98bUOx45aUAiYc6prOl1WpOs=; b=Sp7vXjkvcuM9a5 3009Zvb+2Yx4v3cedUrrpfVgIRtyqjM62PyW9SzFaVrNWsL7dQkLVpgv0UVcV9mzPpD9N6OjemEBf 5fYW0rIVJPYHdrh42DyyDe3hxs4L8fR5m2QcoikYl8eZR2BcgT8aJoFditE2L8OTxy/SrsEs4RXnx JMC0eJNTXJlPTRntObJ0L4mNTqVwPNh34QSPvMYwS8/6S2YpJv9mN/9Kt00DhPJ0Y0vOQzpdg/kMM ifbCbmvEEbNTD8h3NGDc867A5sddZC+e/Q/4/L8IpcXfQUM+j32slESDQO+2mO0+Kpk7sHDRlvsET ZgZ2oRRnovqY+J39PAoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nR8An-00GL22-NQ; Mon, 07 Mar 2022 07:52:53 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nR8Ak-00GL1L-JK for linux-arm-kernel@lists.infradead.org; Mon, 07 Mar 2022 07:52:51 +0000 Received: by mail-pl1-x635.google.com with SMTP id s1so13025411plg.12 for ; Sun, 06 Mar 2022 23:52:49 -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=fNVhu6NstuF9oQwubQhxrrg5qS1nBL78GxXqPU0UXj4=; b=AoG99Mg6T+IVKUbJHAXoR+Sp8bcgGB0jHy32u7VbdEU8d+2Om7533Qb85hxIS9xvSd 8HArsoR9K1FP693STCoRuFab6hWwsDuy8t8ZSW+9TuqV/QV6Vvc2dchHX6Unbef+Z7iC oJHHa+gzIAo4ERyLoSCysrR/5Z3hkZXgOql3M3qk76UintPRcg+U1XZf5AABzii1YVxN n5KJMCnDz6+ZFJQVaoJpr2hc3gJTLT3dVS8LL6K3AFDJEaNdsbjtMQczFWGlnt35J+l5 v8xTdOuehkXK5ejjVNOckogM111ptMethooTfaQB2DLf5xeoTl1tAlC9gBUJlvHT3OIa mrAg== 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=fNVhu6NstuF9oQwubQhxrrg5qS1nBL78GxXqPU0UXj4=; b=Eoakap6VFrLw/UHMwLlhL3ArbmmN6bNT5W6Nv4bCSOCE2X6S17FcvKwM7f86iWV3JT sMRVROM+k2PqsNsEEqEt4l+vEAFz81r/ZQrW7gr1WwvD/eYJ1uIrwDWV5i0HQk7Wc1bf +1VXIZJBdRUyvb/fcOYuQuMbPSSd9XjfyUpYLFnDEuYjoqS45+X2pMzQ7I2pkPuEqcQZ Q1R32lUDrl0InPJAs2i6q6CZamRSBRlJePjSMca1MbnHjXDVWO5bgIHIqpGh1+hA/gFK wkl3tsRgW1sQVKAbv103VmWrZzLCqqMRAzJJxc+SezKA1dLYhoByA5IMjiyOrDus3oQE QrtA== X-Gm-Message-State: AOAM533Xl52vOnnZUmkCU0S41YdgwyPCGvBmEYPX2bA8IFh5jz3Jqi9j c3Uyryl6Mz+5gdZGkVHCBJc= X-Google-Smtp-Source: ABdhPJwdZXTCxgo9TNoVYXkRa1iK3ipktgWmQFvyow6ygoh7afXRkDlVL1IVZIQJ65C6hA06x7FtVw== X-Received: by 2002:a17:90b:4b4a:b0:1bf:83d:6805 with SMTP id mi10-20020a17090b4b4a00b001bf083d6805mr24285924pjb.174.1646639569513; Sun, 06 Mar 2022 23:52:49 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id a133-20020a621a8b000000b004f6a79008ddsm12310777pfa.45.2022.03.06.23.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Mar 2022 23:52:49 -0800 (PST) From: Miaoqian Lin To: Sylwester Nawrocki , Mauro Carvalho Chehab , Krzysztof Kozlowski , Alim Akhtar , Kyungmin Park , Younghwan Joo , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH] media: exynos4-is: Fix PM disable depth imbalance in fimc_is_probe Date: Mon, 7 Mar 2022 07:52:06 +0000 Message-Id: <20220307075206.10737-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-20220306_235250_661041_D35BE885 X-CRM114-Status: GOOD ( 12.34 ) 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 probe fails then we need to call pm_runtime_disable() to balance out the previous pm_runtime_enable() call. Fixes: 9a761e436843 ("[media] exynos4-is: Add Exynos4x12 FIMC-IS driver") Signed-off-by: Miaoqian Lin Reviewed-by: Krzysztof Kozlowski Reviewed-by: Alim Akhtar --- drivers/media/platform/exynos4-is/fimc-is.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index e55e411038f4..81b290dace3a 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c @@ -830,7 +830,7 @@ static int fimc_is_probe(struct platform_device *pdev) ret = pm_runtime_resume_and_get(dev); if (ret < 0) - goto err_irq; + goto err_pm_disable; vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32)); @@ -864,6 +864,8 @@ static int fimc_is_probe(struct platform_device *pdev) pm_runtime_put_noidle(dev); if (!pm_runtime_enabled(dev)) fimc_is_runtime_suspend(dev); +err_pm_disable: + pm_runtime_disable(dev); err_irq: free_irq(is->irq, is); err_clk: