Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 2 Jul 2018 14:23:27 +0300
From:   Sakari Ailus <sakari.ailus@iki.fi>
To:     Steve Longerbeam <slongerbeam@gmail.com>
Cc:     linux-media@vger.kernel.org,
        Steve Longerbeam <steve_longerbeam@mentor.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v5 15/17] media: platform: Switch to
 v4l2_async_notifier_add_subdev
Message-ID: <20180702112327.3rzfxmhghoakbcyz@valkosipuli.retiisi.org.uk>
References: <1530298220-5097-1-git-send-email-steve_longerbeam@mentor.com>
 <1530298220-5097-16-git-send-email-steve_longerbeam@mentor.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1530298220-5097-16-git-send-email-steve_longerbeam@mentor.com>
User-Agent: NeoMutt/20170113 (1.7.2)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Jun 29, 2018 at 11:49:59AM -0700, Steve Longerbeam wrote:
> diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
> index a96f53c..8464ceb 100644
> --- a/drivers/media/platform/davinci/vpif_capture.c
> +++ b/drivers/media/platform/davinci/vpif_capture.c
> @@ -1553,7 +1553,7 @@ vpif_capture_get_pdata(struct platform_device *pdev)
>  					    sizeof(*chan->inputs),
>  					    GFP_KERNEL);
>  		if (!chan->inputs)
> -			return NULL;
> +			goto err_cleanup;
>  
>  		chan->input_count++;
>  		chan->inputs[i].input.type = V4L2_INPUT_TYPE_CAMERA;
> @@ -1587,28 +1587,30 @@ vpif_capture_get_pdata(struct platform_device *pdev)
>  			rem->name, rem);
>  		sdinfo->name = rem->full_name;
>  
> -		pdata->asd[i] = devm_kzalloc(&pdev->dev,
> -					     sizeof(struct v4l2_async_subdev),
> -					     GFP_KERNEL);
> -		if (!pdata->asd[i]) {
> +		pdata->asd[i] = v4l2_async_notifier_add_fwnode_subdev(
> +			&vpif_obj.notifier, of_fwnode_handle(rem),
> +			sizeof(struct v4l2_async_subdev));
> +		if (IS_ERR(pdata->asd[i])) {
>  			of_node_put(rem);
> -			pdata = NULL;
> -			goto done;
> +			goto err_cleanup;
>  		}
>  
> -		pdata->asd[i]->match_type = V4L2_ASYNC_MATCH_FWNODE;
> -		pdata->asd[i]->match.fwnode = of_fwnode_handle(rem);
> -		of_node_put(rem);
> +		of_node_put(endpoint);

You end up putting the same endpoint twice in the successful case.

One way to address that would be to get the OF node's remote port parent
(i.e. the device) immediately so you can forget OF node use counts in error
handling.

>  	}
>  
>  done:
> -	if (pdata) {
> -		pdata->asd_sizes[0] = i;
> -		pdata->subdev_count = i;
> -		pdata->card_name = "DA850/OMAP-L138 Video Capture";
> -	}
> +	of_node_put(endpoint);
> +	pdata->asd_sizes[0] = i;
> +	pdata->subdev_count = i;
> +	pdata->card_name = "DA850/OMAP-L138 Video Capture";
>  
>  	return pdata;
> +
> +err_cleanup:
> +	v4l2_async_notifier_cleanup(&vpif_obj.notifier);
> +	of_node_put(endpoint);
> +
> +	return NULL;
>  }

-- 
Sakari Ailus
e-mail: sakari.ailus@iki.fi