From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Sean Young <sean@mess.org>,
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, 20 Sep 2021 10:19:48 +1000 [thread overview]
Message-ID: <20210920101948.34a93713@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1771 bytes --]
Hi all,
After merging the v4l-dvb-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/media/rc/ir_toy.c: In function 'irtoy_tx':
drivers/media/rc/ir_toy.c:332:36: error: 'STATE_RESET' undeclared (first use in this function)
332 | sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
| ^~~~~~~~~~~
drivers/media/rc/ir_toy.c:332:36: note: each undeclared identifier is reported only once for each function it appears in
Caused by commit
6a014f20734d ("media: ir_toy: allow tx carrier to be set")
interacting with commit
f0c15b360fb6 ("media: ir_toy: prevent device from hanging during transmit")
from the v4l-vdb-fixes tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Sep 2021 10:14:37 +1000
Subject: [PATCH] fix for "media: ir_toy: allow tx carrier to be set"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/media/rc/ir_toy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/rc/ir_toy.c b/drivers/media/rc/ir_toy.c
index 9ea91d418635..71aced52248f 100644
--- a/drivers/media/rc/ir_toy.c
+++ b/drivers/media/rc/ir_toy.c
@@ -329,7 +329,7 @@ static int irtoy_tx(struct rc_dev *rc, uint *txbuf, uint count)
// with its led on. It does not respond to any command when this
// happens. To work around this, re-enter sample mode.
err = irtoy_command(irtoy, COMMAND_SMODE_EXIT,
- sizeof(COMMAND_SMODE_EXIT), STATE_RESET);
+ sizeof(COMMAND_SMODE_EXIT), STATE_COMMAND_NO_RESP);
if (err) {
dev_err(irtoy->dev, "exit sample mode: %d\n", err);
return err;
--
2.32.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-09-20 0:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 0:19 Stephen Rothwell [this message]
2021-09-20 7:39 ` linux-next: build failure after merge of the v4l-dvb-next tree Sean Young
-- strict thread matches above, loose matches on Subject: below --
2024-05-01 0:22 Stephen Rothwell
2023-10-09 0:08 Stephen Rothwell
2023-10-09 9:25 ` Bryan O'Donoghue
2023-10-09 9:50 ` Hans Verkuil
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=20210920101948.34a93713@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sean@mess.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).