From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09FA5C55179 for ; Tue, 27 Oct 2020 17:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA86224181 for ; Tue, 27 Oct 2020 17:49:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603820981; bh=QM+h2XcZvWG3S4Kr9biQIINjoxjJFmG14oo3uDJsnsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=obBmN9cdbtcsUPD6gJgmbPXzIyREAnNBHGSF+n/DTM4df+b4V1YVlmvkb0F+yGsLu kboXWovbEriRShSMPQ9RIfqHgEWclE56P2ZvAdYAmPOiEG7aBy11dcWTPCtmz2lp/B FpqWrsRMTDsdOmHoOGd0er6Bslve/wQ4ogmcMVFk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2902138AbgJ0Rqj (ORCPT ); Tue, 27 Oct 2020 13:46:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:53760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2901805AbgJ0O1c (ORCPT ); Tue, 27 Oct 2020 10:27:32 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9363420780; Tue, 27 Oct 2020 14:27:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808852; bh=QM+h2XcZvWG3S4Kr9biQIINjoxjJFmG14oo3uDJsnsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tZbDGLGPv4AF8Djfm29un9CdEXtimdq1FTupM0CQ96Af0yZbSV+aBb+qTAofKfl7D mmBs05yCN1xH0iDT5w8nSl8UK70Ox1PxM8Nl1TIrua1dUK2nCJlAShJkw1JwMzDz2/ mL4l2vuXyIV9bo3o+hXtSZ5hYW1ZlCgiVkAzgQ80= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , Fabien Dessenne , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 218/264] media: bdisp: Fix runtime PM imbalance on error Date: Tue, 27 Oct 2020 14:54:36 +0100 Message-Id: <20201027135440.911734347@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135430.632029009@linuxfoundation.org> References: <20201027135430.632029009@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dinghao Liu [ Upstream commit dbd2f2dc025f9be8ae063e4f270099677238f620 ] pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Signed-off-by: Dinghao Liu Reviewed-by: Fabien Dessenne Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c index 40c4eef71c34c..00f6e3f06dac5 100644 --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c @@ -1371,7 +1371,7 @@ static int bdisp_probe(struct platform_device *pdev) ret = pm_runtime_get_sync(dev); if (ret < 0) { dev_err(dev, "failed to set PM\n"); - goto err_dbg; + goto err_pm; } /* Filters */ @@ -1399,7 +1399,6 @@ static int bdisp_probe(struct platform_device *pdev) bdisp_hw_free_filters(bdisp->dev); err_pm: pm_runtime_put(dev); -err_dbg: bdisp_debugfs_remove(bdisp); err_v4l2: v4l2_device_unregister(&bdisp->v4l2_dev); -- 2.25.1