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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFEEBC43334 for ; Thu, 7 Jul 2022 13:40:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235944AbiGGNkD (ORCPT ); Thu, 7 Jul 2022 09:40:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235431AbiGGNj6 (ORCPT ); Thu, 7 Jul 2022 09:39:58 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC78718349 for ; Thu, 7 Jul 2022 06:39:57 -0700 (PDT) Received: from pyrite.rasen.tech (softbank036240121080.bbtec.net [36.240.121.80]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0E6CCD00; Thu, 7 Jul 2022 15:39:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657201196; bh=diixu0MQlBX3XaPIgi4rFyO41T70rAiMJ2feLfDRqZc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pAbz2j2OeV4wOg6g2rDO13FKGdqzu7ZFMwlHcCVYxQvPdz2gXfiOq5ehdnQmGcIKD jR51zw0uerWj5VlurQfLSGeSOkb7xnsmuldIxu65ovRMnylmtQu+tUn1qIoqz6Ks/A 3BGfKLxXI9RSGg7Ff0/eTm73qgNiIPR7F0BmIU14= Date: Thu, 7 Jul 2022 22:39:47 +0900 From: paul.elder@ideasonboard.com To: Laurent Pinchart Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, Dafna Hirschfeld , Heiko Stuebner , Helen Koike Subject: Re: [PATCH v2 06/55] media: rkisp1: Disable runtime PM in probe error path Message-ID: <20220707133947.GK3886060@pyrite.rasen.tech> References: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> <20220630230713.10580-7-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220630230713.10580-7-laurent.pinchart@ideasonboard.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Laurent, On Fri, Jul 01, 2022 at 02:06:24AM +0300, Laurent Pinchart wrote: > If the v4l2_device_register() call fails, runtime PM is left enabled. > Fix it. > > Signed-off-by: Laurent Pinchart > Reviewed-by: Dafna Hirschfeld Reviewed-by: Paul Elder > --- > drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > index 97d569968285..248f0172ca62 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > @@ -523,7 +523,7 @@ static int rkisp1_probe(struct platform_device *pdev) > > ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev); > if (ret) > - return ret; > + goto err_pm_runtime_disable; > > ret = media_device_register(&rkisp1->media_dev); > if (ret) { > @@ -543,6 +543,7 @@ static int rkisp1_probe(struct platform_device *pdev) > media_device_unregister(&rkisp1->media_dev); > err_unreg_v4l2_dev: > v4l2_device_unregister(&rkisp1->v4l2_dev); > +err_pm_runtime_disable: > pm_runtime_disable(&pdev->dev); > return ret; > } 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 781D1C433EF for ; Thu, 7 Jul 2022 13:40:10 +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=deaokJEPPndoaylzcf87gf6A1vLEuZs2BU58z5N9U3M=; b=W0jFGQ3TFGl9VH sbIbfAUsXZHzfEQ0FCRqNf/LkeD2TFLx+Os7Xac1QBMGRAzoBFPXzoQtE97O/OSTfYleVd7nHnuLm p/X4/dz/RwSszpXitlpCYPeQV0V9TSRuAFl1NBn6eshbaKEHI8yI1iWYkpLRQUxJ15a8P4boR7bJk Spe7HCEBXwcbkeoPp3/9qQCyQI4X1h3xfTXIEgKr8uX4zz76QGfzjLySI5Ui0uct9AS5Gups/wXNE qLFUbZAvCEjF2kiwCb5kX5Qxp8CM5WeLFZ9FLsK9hks2LjJpJKEaqathhyxQh5h0UVDYeq6bne1J8 j24a42DSZolX2rZT/L7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9Rjc-00GIk4-KM; Thu, 07 Jul 2022 13:40:00 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o9RjZ-00GIih-Rv for linux-rockchip@lists.infradead.org; Thu, 07 Jul 2022 13:39:59 +0000 Received: from pyrite.rasen.tech (softbank036240121080.bbtec.net [36.240.121.80]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0E6CCD00; Thu, 7 Jul 2022 15:39:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657201196; bh=diixu0MQlBX3XaPIgi4rFyO41T70rAiMJ2feLfDRqZc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pAbz2j2OeV4wOg6g2rDO13FKGdqzu7ZFMwlHcCVYxQvPdz2gXfiOq5ehdnQmGcIKD jR51zw0uerWj5VlurQfLSGeSOkb7xnsmuldIxu65ovRMnylmtQu+tUn1qIoqz6Ks/A 3BGfKLxXI9RSGg7Ff0/eTm73qgNiIPR7F0BmIU14= Date: Thu, 7 Jul 2022 22:39:47 +0900 From: paul.elder@ideasonboard.com To: Laurent Pinchart Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, Dafna Hirschfeld , Heiko Stuebner , Helen Koike Subject: Re: [PATCH v2 06/55] media: rkisp1: Disable runtime PM in probe error path Message-ID: <20220707133947.GK3886060@pyrite.rasen.tech> References: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> <20220630230713.10580-7-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220630230713.10580-7-laurent.pinchart@ideasonboard.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220707_063958_098016_E80B8D08 X-CRM114-Status: GOOD ( 14.57 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Hi Laurent, On Fri, Jul 01, 2022 at 02:06:24AM +0300, Laurent Pinchart wrote: > If the v4l2_device_register() call fails, runtime PM is left enabled. > Fix it. > > Signed-off-by: Laurent Pinchart > Reviewed-by: Dafna Hirschfeld Reviewed-by: Paul Elder > --- > drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > index 97d569968285..248f0172ca62 100644 > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c > @@ -523,7 +523,7 @@ static int rkisp1_probe(struct platform_device *pdev) > > ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev); > if (ret) > - return ret; > + goto err_pm_runtime_disable; > > ret = media_device_register(&rkisp1->media_dev); > if (ret) { > @@ -543,6 +543,7 @@ static int rkisp1_probe(struct platform_device *pdev) > media_device_unregister(&rkisp1->media_dev); > err_unreg_v4l2_dev: > v4l2_device_unregister(&rkisp1->v4l2_dev); > +err_pm_runtime_disable: > pm_runtime_disable(&pdev->dev); > return ret; > } _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip