From patchwork Tue Oct 27 13:51:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 311826 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 C4099C55178 for ; Tue, 27 Oct 2020 18:03:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8ADE121556 for ; Tue, 27 Oct 2020 18:03:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603821814; bh=4dYIerY6Lyw+agPoGxjvA/z1ZZEJA0SmrHwnIzTauOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=noDECtzAG6WgmDkH/j8JRsIBDYf/nf+P+xiFNO35hg4Bt4JsaGTHUY6A8u06KewZm olgv0T7x3W2A8BvrfoVpvCMmJgHGaBCULl3ETRZQ40KOKGrD1+a8jRsBZ6rqjvw66g rkfn83XKEA5LqhR6PWkX7PUjMeCAFKnX/jWphrWk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757389AbgJ0OTL (ORCPT ); Tue, 27 Oct 2020 10:19:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:43044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2901137AbgJ0OTK (ORCPT ); Tue, 27 Oct 2020 10:19:10 -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 9DC2E2072D; Tue, 27 Oct 2020 14:19:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603808350; bh=4dYIerY6Lyw+agPoGxjvA/z1ZZEJA0SmrHwnIzTauOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CM0Kyhr1K/n4FPsaw+0/AjH1Wf7dWGOZ9H7UylupeMzAL2UOYKNIduUR2jnXBXF95 luWnzQUXgXAiwLAp9StSNsXQ1mWR6XEmoe+am4LYz6k9KGFo5h9360eNa23DjkI2QM lgpTGjR42Jheq55zYyXpyQa3Af6d0/nLXKhA7KZE= 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 059/264] media: s5p-mfc: Fix a reference count leak Date: Tue, 27 Oct 2020 14:51:57 +0100 Message-Id: <20201027135433.445783753@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 78741ce98c2e36188e2343434406b0e0bc50b0e7 ] 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_noidle() is not called in error handling paths. Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails. Fixes: c5086f130a77 ("[media] s5p-mfc: Use clock gating only on MFC v5 hardware") Signed-off-by: Qiushi Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c index 5e080f32b0e82..95abf2bd7ebae 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c @@ -83,8 +83,10 @@ int s5p_mfc_power_on(void) int i, ret = 0; ret = pm_runtime_get_sync(pm->device); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(pm->device); return ret; + } /* clock control */ for (i = 0; i < pm->num_clocks; i++) {