From patchwork Tue Oct 27 13:46:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 289667 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 A2AACC8300E for ; Tue, 27 Oct 2020 15:43:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B34C2242F for ; Tue, 27 Oct 2020 15:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813428; bh=hV0V+xWLDwIt8RlzIKrpZDFFJcL86wR5MTr1Yfo3bnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=eSNdRJ6jcWH4kBpx5+g1JkpHtAWeASQfUw5gpR2ztZ2UPdSYy2wjHLwplFkG3riuI +V3S3heUn4+q3ug35usPiP52XbdHYVqKiCG0nmDHZJZmlQKJLfBGoORSAL/ETZreN7 ROW2hGoTbhQtLKFmtC0xA9uWYzEixNuDRJ9f8XRY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S368742AbgJ0P1Q (ORCPT ); Tue, 27 Oct 2020 11:27:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:40476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1797765AbgJ0PZR (ORCPT ); Tue, 27 Oct 2020 11:25:17 -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 2159D2064B; Tue, 27 Oct 2020 15:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812316; bh=hV0V+xWLDwIt8RlzIKrpZDFFJcL86wR5MTr1Yfo3bnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AFoh+aPnP1njlZllYTNQUPJsquD7RxM50/QLb/nyLYPj0AuszehLCCx4EPeNvdbQC MiwXV0Cz9yUyYqQxXfIBTEDkQcPS7lw+Mik+H8yJUTgN+STehidbzsGb+ymCZRkXoh jfAjPvn4CG1ss1MRFuB8OU/yhlJoCvReWOeEg/0s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiushi Wu , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.9 166/757] media: rcar-vin: Fix a reference count leak. Date: Tue, 27 Oct 2020 14:46:56 +0100 Message-Id: <20201027135458.380331643@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qiushi Wu [ Upstream commit aaffa0126a111d65f4028c503c76192d4cc93277 ] pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails. Fixes: 90dedce9bc54 ("media: rcar-vin: add function to manipulate Gen3 chsel value") Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/rcar-vin/rcar-dma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c index a5dbb90c5210b..260604dc5791b 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -1409,8 +1409,10 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel) int ret; ret = pm_runtime_get_sync(vin->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(vin->dev); return ret; + } /* Make register writes take effect immediately. */ vnmc = rvin_read(vin, VNMC_REG);