Re: linux-next: build failure after merge of the v4l-dvb-next tree

[Bryan O'Donoghue]

On 09/10/2023 01:08, Stephen Rothwell wrote:
> Hi all,
>
> After merging the v4l-dvb-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/media/platform/qcom/camss/camss.c: In function 'camss_probe':
> drivers/media/platform/qcom/camss/camss.c:1634:17: error: label 'err_cleanup' used but not defined
>   1634 |                 goto err_cleanup;
>        |                 ^~~~
>
> Caused by commits
>
>    7405116519ad ("media: qcom: camss: Fix pm_domain_on sequence in probe")
>    b278080a89f4 ("media: qcom: camss: Fix V4L2 async notifier error path")
>
> interacting with commit
>
>    2c1bae27df78 ("media: qcom: camss: Fix pm_domain_on sequence in probe")
>
> from the v4l-dvb tree.
>
> I have applied the following merge resolution patch for today.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 9 Oct 2023 11:05:26 +1100
> Subject: [PATCH] v4l-dvb-next: fix up for bad automatic merge.
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>   drivers/media/platform/qcom/camss/camss.c | 6 ------
>   1 file changed, 6 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 38d20b12cdd8..8e78dd8d5961 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -1628,12 +1628,6 @@ static int camss_probe(struct platform_device *pdev)
>   		return ret;
>   	}
>   
> -	ret = camss_configure_pd(camss);
> -	if (ret < 0) {
> -		dev_err(dev, "Failed to configure power domains: %d\n", ret);
> -		goto err_cleanup;
> -	}
> -
>   	ret = camss_init_subdevices(camss);
>   	if (ret < 0)
>   		goto err_genpd_cleanup;

commit: f69791c39745e ("media: qcom: camss: Fix genpd cleanup") already 
appears in linux-next/master @ next-20231009 which commit: 2c1bae27df78 
("media: qcom: camss: Fix pm_domain_on sequence in probe") depends on.

Already looks resolved.

---
bod