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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D83F2C433F5 for ; Tue, 30 Nov 2021 12:13:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4itMBgSP09cLHV6mhf+nQE1dOaRD+aPT3Nipakop/3s=; b=f84f1K68IuylVB vvNhSKllMdPZtwi7U4qOvKXTPPTNEmkNjzTvZqghtS4KZ4X9Gn3z2XRfRxOllkC1gpz2Iui/+pLSF gCaaXEmoACKkWdaNuQQEvpc39AvWN7XTqOkl7uLPVaNjBh9N0jO/1FAc01V4NcJG/EJa7T3sua+Qm RjcsjyK/p18xRv/J2WxUroB1Jt8YiXD35vcq+/8Sh3jmWeE8WWGbWN4bi2vziJhGc5GFEMb9AZ6Nk UO9fsgCZ29ABIsKEKiddLQ3+4HCBsisEDUJfHYZwc+FUJ9pvXPmYoCLksuhWVDK0MgpxEbiQECigq ResCPYngIEe0W+eSZa6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms1zM-0052mL-VQ; Tue, 30 Nov 2021 12:12:01 +0000 Received: from mail-ua1-x92c.google.com ([2607:f8b0:4864:20::92c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms1zI-0052kU-K0 for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 12:11:58 +0000 Received: by mail-ua1-x92c.google.com with SMTP id j14so40748883uan.10 for ; Tue, 30 Nov 2021 04:11:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ezWEJY1UxPw2PKLFovyt/KEg8Ohs2gMv1LSWNGSFZEM=; b=O4wjtzO3oSmjpegvP0d5IYeBeM4kG4ToTjzD/3PruseWwAGb5cdISnLLUb5hEAIVNY wmeJA0GLnfKGt09V6oEsF8HesJaRWNZnMFH7h947bSxxBmb+ilkkhMHbie2QMXyUMebg JU8XJOwSGKCkwWhv3hLlPJIBciMmE+wTYcpjuJ9IGNpcMseH0FiyPqqWyPRiExfBc8mQ vzc2AYzIwVZ68BzIbhw3j1NpG5Jf6V8NE5y7wdqkjmGtDKdqvB3geomqlex8POnJ7FOQ vurW53g2dzU7MrJNgQLMQG1S7wHlLRpVhYjriz1narmIPOH+4qRRuzjSmOaz9Yq22170 zIlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ezWEJY1UxPw2PKLFovyt/KEg8Ohs2gMv1LSWNGSFZEM=; b=5p2QBXvXU2Uajdq6qYRVsCfOn0/nHDAektHeS2O9l6eHoo4d4PEMi5kraHWqC26W06 VV6Cz5cBUg+/BdLPgTwwVkWBBcwcta33x33UiCmFvji97uPPbC7kDzkZXdRglzQEIKkl s74zxabUKdt9Yf2VJJyTFWH8dgio1G45E9JEYvBraCXsvUbLfVkjWew8XHuQTWFaYv1r v0KlFVkJ2GckTjRAw4cqzSij7J8/r3fNr0kLNwYKS/5INvY4WnDbzowgBlpxC5cUHZfB FCu1bQp1ZJ3ICeORDYMcEKKZ8dSd5lySUZY994+qLM61FeMVtcM+Q7giF23wsbhGnidv ztVg== X-Gm-Message-State: AOAM5337s3V5WvpLXVWlaUfnubog+34brtyUInY/nDw4mD/m8MzuySzd zFjk973hHRBy+8IxVVt8RN3zcw== X-Google-Smtp-Source: ABdhPJxLXNhuLHrxh6uP38+mjJjJNBxkZpXCbKo3QO6/zmhliW+JnAqbYneMwOFJzA7HoYYmlfSDzg== X-Received: by 2002:ab0:22c6:: with SMTP id z6mr57430523uam.80.1638274314802; Tue, 30 Nov 2021 04:11:54 -0800 (PST) Received: from eze-laptop (host208.201-253-22.telecom.net.ar. [201.253.22.208]) by smtp.gmail.com with ESMTPSA id s13sm9960047vkh.32.2021.11.30.04.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 04:11:53 -0800 (PST) Date: Tue, 30 Nov 2021 09:11:48 -0300 From: Ezequiel Garcia To: Jernej Skrabec Cc: linux-media@vger.kernel.org, nicolas.dufresne@collabora.com, mchehab@kernel.org, robh+dt@kernel.org, mripard@kernel.org, wens@csie.org, p.zabel@pengutronix.de, andrzej.p@collabora.com, gregkh@linuxfoundation.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: Re: [PATCH v2 1/9] media: hantro: Fix probe func error path Message-ID: References: <20211129182633.480021-1-jernej.skrabec@gmail.com> <20211129182633.480021-2-jernej.skrabec@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211129182633.480021-2-jernej.skrabec@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_041156_903406_0EDCE1AD X-CRM114-Status: GOOD ( 19.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Nov 29, 2021 at 07:26:25PM +0100, Jernej Skrabec wrote: > If clocks for some reason couldn't be enabled, probe function returns > immediately, without disabling PM. This obviously leaves PM ref counters > unbalanced. > > Fix that by jumping to appropriate error path, so effects of PM functions > are reversed. > > Fixes: 775fec69008d ("media: add Rockchip VPU JPEG encoder driver") > Signed-off-by: Jernej Skrabec Reviewed-by: Ezequiel Garcia Thanks! > --- > drivers/staging/media/hantro/hantro_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > index ab2467998d29..3d3107a39dae 100644 > --- a/drivers/staging/media/hantro/hantro_drv.c > +++ b/drivers/staging/media/hantro/hantro_drv.c > @@ -981,7 +981,7 @@ static int hantro_probe(struct platform_device *pdev) > ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); > if (ret) { > dev_err(&pdev->dev, "Failed to prepare clocks\n"); > - return ret; > + goto err_pm_disable; > } > > ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev); > @@ -1037,6 +1037,7 @@ static int hantro_probe(struct platform_device *pdev) > v4l2_device_unregister(&vpu->v4l2_dev); > err_clk_unprepare: > clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); > +err_pm_disable: > pm_runtime_dont_use_autosuspend(vpu->dev); > pm_runtime_disable(vpu->dev); > return ret; > -- > 2.34.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel