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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
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:
pgphyunp3heNR.pgp
Description: OpenPGP digital signature
