From patchwork Sat Jun 13 23:27:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wu000273@umn.edu X-Patchwork-Id: 209491 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, 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 57E46C433E0 for ; Sat, 13 Jun 2020 23:27:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 35CC7207F7 for ; Sat, 13 Jun 2020 23:27:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="Csp8fRs7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726578AbgFMX1V (ORCPT ); Sat, 13 Jun 2020 19:27:21 -0400 Received: from mta-p5.oit.umn.edu ([134.84.196.205]:58200 "EHLO mta-p5.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726272AbgFMX1U (ORCPT ); Sat, 13 Jun 2020 19:27:20 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 49ktzW5zJXz9vZ1k for ; Sat, 13 Jun 2020 23:27:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2QHizG-itpOm for ; Sat, 13 Jun 2020 18:27:19 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id 49ktzW4M1nz9vZ22 for ; Sat, 13 Jun 2020 18:27:19 -0500 (CDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mta-p5.oit.umn.edu 49ktzW4M1nz9vZ22 DKIM-Filter: OpenDKIM Filter v2.11.0 mta-p5.oit.umn.edu 49ktzW4M1nz9vZ22 Received: by mail-io1-f70.google.com with SMTP id z20so8808731iog.1 for ; Sat, 13 Jun 2020 16:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=MpamanQ4MpDumyihZoEEj0ayN/iNuyeJtVs/CuktPVA=; b=Csp8fRs7Uy+StTI+645mbkSC0XK86N68GqBqTuxWDPZaAXjTNTcW+33Yu5pnbzsUst 2zAfG8qr16PkqUFCE5wUUSBarQFwevUXvqBNc/dEEzheHfbRxAL5wDsL6R+0fneX9z9v 5kYteIDPnpYvILOAW9D8B+I39r+Zr+FmAiN6sI/hicPLn9k30kd54geM9NkMxnaSml9j 5/VkPJxfcp23M59MYVMbyf9D6H0RbvUWb+olfVFljhjPD/hYLzLftYL3k3m8ahDNL2Nv z7hP8f3jLX4RgmHoIgpHcE8P22bCZBNuz1te4NQamwJRcRk0+DPO1ZqHouH/OfmdkRVA 8Xxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MpamanQ4MpDumyihZoEEj0ayN/iNuyeJtVs/CuktPVA=; b=KMVGtX2IDWXnDzA9IVSvGpOEilgj4dWlEFy2OPgm5ZheseC422kx4HL9rHxOPyw6Xp wBjQ3oZ2vRACk4MGQHK1M2u+CqmmG8CvXPEWBxcic27kJwFGNG7T/32N32AHT41+QpEx s8TmH4uWDL9iSDxI6L4XJFy66/qgiY90X4XYKsxhMhPTgnGOwg21Dr3xyVqZdQiv8Iit eb2Et/GYFNqgCR92JJn+w63PZ41FKbHpUn0p6kSDM0Ig/sQGXimpi/R0uUYedbdPSm/H lqla+7SOKVH0mUJbtFyaGsiuqUPpc/v4xGcSWiWP3a/a+HOFuNqjNyYMQA6Ahw/fCH36 NLzA== X-Gm-Message-State: AOAM531Sluh1HXTYw324el07YGXjMcr9P8AIphmf1vxU+uJU9yDRzX2x NlT1RkwypUA/zAymnwRIW8aJfURKUHwRtifWklsZWfZSfdaeI1+cZ024IsOzfE3v4H/vjj8Rgzj Se7chp5yeCuMwci+S0nvSrE1YPK4= X-Received: by 2002:a92:2515:: with SMTP id l21mr19014214ill.64.1592090839134; Sat, 13 Jun 2020 16:27:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMEDlkkWxdPrIuB4rfOhbAimbKN1+ipCveYxCE39nD1rekM86PtxYYKuvjgZnzaG6VylvRuQ== X-Received: by 2002:a92:2515:: with SMTP id l21mr19014197ill.64.1592090838889; Sat, 13 Jun 2020 16:27:18 -0700 (PDT) Received: from qiushi.cs.umn.edu ([2607:ea00:101:3c74:4874:45:bcb4:df60]) by smtp.gmail.com with ESMTPSA id a10sm5441544ilb.31.2020.06.13.16.27.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jun 2020 16:27:18 -0700 (PDT) From: wu000273@umn.edu To: kjlu@umn.edu Cc: wu000273@umn.edu, Todor Tomov , Andy Gross , Bjorn Andersson , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: camss: Fix a reference count leak. Date: Sat, 13 Jun 2020 18:27:12 -0500 Message-Id: <20200613232713.19174-1-wu000273@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Qiushi Wu pm_runtime_get_sync() increments the runtime PM usage counter even when it returns an error code, causing incorrect ref count if PM runtime put is not called in error handling paths. Thus call pm_runtime_put_sync() if pm_runtime_get_sync() fails. Fixes: 02afa816dbbf ("media: camss: Add basic runtime PM support") Signed-off-by: Qiushi Wu --- drivers/media/platform/qcom/camss/camss-csiphy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index 008afb85023b..3c5b9082ad72 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -176,8 +176,10 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on) int ret; ret = pm_runtime_get_sync(dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_sync(dev); return ret; + } ret = csiphy_set_clock_rates(csiphy); if (ret < 0) {