From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f49.google.com (mail-ua1-f49.google.com [209.85.222.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D6E129CA for ; Tue, 30 Nov 2021 12:11:55 +0000 (UTC) Received: by mail-ua1-f49.google.com with SMTP id w23so40853924uao.5 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=A+OpJBDzozH7kdIU+Vk3ihwkBg0Zb+wqMczjR/iLGb0XbspVlE1Kr/OQMb5v6r2Pml Uu6FcRBc2VMGQ0pygxwO0pBn14rQvwkUbqX3Jbbx02ZMkLsN4dz4tG8SjqMNvTG7T4jl u84MI2/MlTwuYdLNwTkyLyBgjcrB70XMzuB/cAw3hCwqqmuSQRpEXLomHnyugx1iAYTb 5j+x9wn9e3pnh9h70gTctR2NMhrJ9odISJjCY0yQv6+WgXjAFHOk/uuIAm0dJ/nh6PyF OJBnA9vrLPtMqgkts19zekti7zM34+7WcUTFMwutTgoa0tj7193XeENjtjkaK7rdvArY q3mQ== X-Gm-Message-State: AOAM532C0XdgjgBhxUTw1EG6HKHhAQSix+d0dd38Ax7JNbPA8jUVHNCI FLDX75f5vh6n/3WSyy3Cy0MR+Q== 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> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211129182633.480021-2-jernej.skrabec@gmail.com> 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 >