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
Date: Mon, 9 Oct 2023 11:08:52 +1100 [thread overview]
Message-ID: <20231009110852.36b0bd42@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1654 bytes --]
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@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/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;
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-09 0:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 0:08 Stephen Rothwell [this message]
2023-10-09 9:25 ` linux-next: build failure after merge of the v4l-dvb-next tree Bryan O'Donoghue
2023-10-09 9:50 ` Hans Verkuil
-- strict thread matches above, loose matches on Subject: below --
2024-05-06 0:49 Stephen Rothwell
2024-05-07 11:56 ` Sakari Ailus
2024-05-01 0:22 Stephen Rothwell
2021-09-20 0:19 Stephen Rothwell
2021-09-20 7:39 ` Sean Young
2021-05-19 23:55 Stephen Rothwell
2020-06-03 2:46 Stephen Rothwell
2020-06-03 8:13 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231009110852.36b0bd42@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bryan.odonoghue@linaro$(echo .)org \
--cc=hverkuil-cisco@xs4all$(echo .)nl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox