Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Mon, 9 Oct 2023 11:08:52 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Mauro Carvalho Chehab <mchehab@kernel.org>
Cc:     Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
        Hans Verkuil <hverkuil-cisco@xs4all.nl>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the v4l-dvb-next tree
Message-ID: <20231009110852.36b0bd42@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/A1sezmQ/KuRtzY79VQD+=6s";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/A1sezmQ/KuRtzY79VQD+=6s
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_cleanu=
p' 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@canb.auug.org.au>
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@canb.auug.org.au>
---
 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/plat=
form/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;
 	}
=20
-	ret =3D camss_configure_pd(camss);
-	if (ret < 0) {
-		dev_err(dev, "Failed to configure power domains: %d\n", ret);
-		goto err_cleanup;
-	}
-
 	ret =3D camss_init_subdevices(camss);
 	if (ret < 0)
 		goto err_genpd_cleanup;
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

--Sig_/A1sezmQ/KuRtzY79VQD+=6s
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUjRJQACgkQAVBC80lX
0GwuiQf/QfAzuWmGC6qJnIVAonO6LYfjmaUK06Ga8oQlvRphiOSu3980xTLIBg6F
CoANi+4K1bSiQJYDfuQQigeffbfT/4c3FgTM5wP/9VUYIuruoA8NNJJoVcdPYlKI
FGkiRzkAyiZSfWY7gIph9kb5lcYjdRgaJNHnFY/xUX9oWlsptH94AQ5HCe/SzaQT
PBpWMRWoUgYyB/5w79BLJ4d7XZybzi9e8mGo1lnDCL5hCQJVo61260h6cgmH//To
QAunR1ug2qqkuBMSRO7S5gjtIUq03s4s3vBdL08rdjWm6rUEsuRYPvtPw4PeytpB
+UyvJRIw9b0+X74JL5/BfgUBQhd3ig==
=ybwZ
-----END PGP SIGNATURE-----

--Sig_/A1sezmQ/KuRtzY79VQD+=6s--