From patchwork Tue Oct 27 13:51:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312977 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=ham 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 3F1B3C55178 for ; Tue, 27 Oct 2020 14:19:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F41342072D for ; Tue, 27 Oct 2020 14:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808345; bh=ZDyG8KwFTOj5+UyPhn9MMxK/NsBzmC1Z76uWiv9oHXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EBYnChbgDjomhoZwYbv7QObq5QuN97udO8hp48P0fUmVKbbPgIKO74LmcpqN8edqw mKIsQATIJ2cDOqJkIIu+cZH1jc6BkMeE7qLWn1Ri9wqnpLYKQ0I5MEkIuLKq2Cgbo0 sCi4JLAlNGrufOV2DTNId6B5ivxqyHvKQCeqGIpM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2901104AbgJ0OTA (ORCPT ); Tue, 27 Oct 2020 10:19:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:42786 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2901100AbgJ0OS7 (ORCPT ); Tue, 27 Oct 2020 10:18:59 -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 CF277206F7; Tue, 27 Oct 2020 14:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808339; bh=ZDyG8KwFTOj5+UyPhn9MMxK/NsBzmC1Z76uWiv9oHXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lQpqe/jq922XbZAZRH9lbS6BrytrWlw5bAxbNdfABb+mqSHk8jREQ7Jn3PghUp23Z Q0qK/+jbjSRhY7oGjhSTVcxpVldKPZTF/uZx/WRNYQzZTTo4/cD0QmkC3RHFD2ZJ4l RV7tKbcudmJrtsYxfAsPeB/nNA2bkEaxbvWHIJRk= 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 4.19 055/264] media: rcar-vin: Fix a reference count leak. Date: Tue, 27 Oct 2020 14:51:53 +0100 Message-Id: <20201027135433.257442792@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 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 92323310f7352..70a8cc433a03f 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -1323,8 +1323,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);