From patchwork Tue Mar 1 07:18:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaoqian Lin X-Patchwork-Id: 12764218 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 BD2E8C433EF for ; Tue, 1 Mar 2022 07:20:21 +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:References:In-Reply-To: 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: List-Owner; bh=4CyChUb8RhtcPg0wJF212LpYFl5CX8tQBQR1BlR8YtE=; b=MdTFGpoNKjvImE sWlQ8P9070t7WepxYsXLQfCsVdSSpwapvDumfHjfxAUrVCsK7cJR0Qvy4HX7puRkMUIwE2CfOzJOJ KncgrIQpn0J2XAL058PK96aqBdZBcXVe+m4iCurzhDmkAGIWprvK8BIb5bppMf9abiRZoaI/f0ctH droLIuBQEamnrBNuEi8u4PssrwLS084TpUAHjRcCA1GAnChUxHMc0lg/hUF55xoKYpIbfOgRJCYTO JqXSUNh+Ej5IQycv767z9PpwKWljVBTiuOcltdVZAgwSAndHRkXaNdlAME8+5UAUM8jRoitAbH511 M8pD1ii573YUu8SuO86A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOwmz-00FHIr-Ss; Tue, 01 Mar 2022 07:19:18 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOwmw-00FHIC-Eg for linux-arm-kernel@lists.infradead.org; Tue, 01 Mar 2022 07:19:15 +0000 Received: by mail-pf1-x42a.google.com with SMTP id s11so3037273pfu.13 for ; Mon, 28 Feb 2022 23:19:14 -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:in-reply-to:references; bh=A1lj7LEB75AIU+mhZtWLXPbM8kNEvm/1mDDk0FG6IYs=; b=Rciq4IPJmStry+us4STQnTBTmtXlSxYpTIz8rEuJGRFEmxLK3FEgRxjQw0xWxhCZ7M JYR06XDsCNZgcye7JBhMoOsvinZEqzb3+/UB8VbNSOgOMg4eDVfGFTbnGijGCn2lbNu2 kZth8tSXBSabnD3MDGhSsmxcXpMIdA3PaLrFsCMBP8ZEwKAUg6f6swNd3z/vTuFwkDbO NB5SQ/0QIiX7QlfapMhZEOxsalmLh9K7ZNjwUSS8QOTwGqeptCCq1PA7EKaoj9ChEjX/ 1ny5Mvfv36DToM5cg7IU0o2ZGcfiSCyI7kQzLW8R73I2KdeGpOQWX+2ZOLX32B9vl5dQ ec9g== 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:in-reply-to :references; bh=A1lj7LEB75AIU+mhZtWLXPbM8kNEvm/1mDDk0FG6IYs=; b=iMnFnKXTrT17Wbt/oyk/Y/+6O3X13vsVLtomUsl/HARqE6Jg3F3nQ7RF9hpaNuzjyP XnMxipmA4KA716rAqpB+0aRZ9sIPaOs9KSm53kXSpwvOg5EZvA+bEkqPUAuIVXqUmPp7 ytHmq6bivEdRZkD5QMurlZ0EqURCC7vW8J9aWtBgCpGPkGnIDnH2dGGuoGmRGCPj9UX9 BGw9ACDDaVqaYgXW7nv07+Whwp21JErlDLlqF0b0/Zaa+7uNFG8H3W5qmwA5CUko+oc5 7FRCdihFB+1mHPUwKGgMthBdXm9CILzLiK3+mJPH4gspWPC5BUhyyI3rSKbzzWCkP0J8 8YyQ== X-Gm-Message-State: AOAM531imZ5IM2UarxWBKWQ091eF6nKYvPF4nCmbOTjriU6I3y5qIs12 j7fH8KCZ39b57noHonghWpg= X-Google-Smtp-Source: ABdhPJzdVAn5YJ22/1qh7uw75lH1QnoryDX1v0cXPLqNGJ+2cWPYVeMF4fypeXkiRX8UCTvqiEwYfA== X-Received: by 2002:a63:343:0:b0:376:7f43:ec77 with SMTP id 64-20020a630343000000b003767f43ec77mr17555410pgd.320.1646119153804; Mon, 28 Feb 2022 23:19:13 -0800 (PST) Received: from localhost.localdomain ([159.226.95.43]) by smtp.googlemail.com with ESMTPSA id r15-20020a63ce4f000000b00341c40f913esm12028169pgi.87.2022.02.28.23.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 23:19:13 -0800 (PST) From: Miaoqian Lin To: Eugen Hristev , Mauro Carvalho Chehab , Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , Hans Verkuil , linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linmq006@gmail.com Subject: [PATCH v2] media: atmel: atmel-isc: Fix PM disable depth imbalance in atmel_isc_probe Date: Tue, 1 Mar 2022 07:18:59 +0000 Message-Id: <20220301071859.24285-1-linmq006@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220105111056.4662-1-linmq006@gmail.com> References: <20220105111056.4662-1-linmq006@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_231914_527620_211A4EC8 X-CRM114-Status: GOOD ( 13.05 ) 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 The pm_runtime_enable will increase power disable depth. If the probe fails, we should use pm_runtime_disable() to balance pm_runtime_enable(). Fixes: 0a0e265 ("media: atmel: atmel-isc: split driver into driver base and isc") Signed-off-by: Miaoqian Lin Reviewed-by: Eugen Hristev --- changes in v2: - remove unused label. --- drivers/media/platform/atmel/atmel-sama5d2-isc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c index 1b2063cce0f7..7f1ebbb25437 100644 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c @@ -559,6 +559,8 @@ static int atmel_isc_probe(struct platform_device *pdev) cleanup_subdev: isc_subdev_cleanup(isc); + pm_runtime_disable(dev); + unregister_v4l2_device: v4l2_device_unregister(&isc->v4l2_dev);