From: Cosmin Tanislav <demonsingur@gmail.com>
Cc: Sean Young <sean@mess.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Cosmin Tanislav <demonsingur@gmail.com>
Subject: [PATCH v5 2/3] media: rc: ir-spi: constrain carrier frequency
Date: Fri, 13 Jun 2025 14:21:52 +0300 [thread overview]
Message-ID: <20250613112210.22731-3-demonsingur@gmail.com> (raw)
In-Reply-To: <20250613112210.22731-1-demonsingur@gmail.com>
Carrier frequency is currently unconstrained, allowing the SPI transfer
to be allocated and filled only for it to be later rejected by the SPI
controller since the frequency is too large.
Add a check to constrain the carrier frequency inside
ir_spi_set_tx_carrier().
Also, move the number of bits per pulse to a macro since it is not used
in multiple places.
Signed-off-by: Cosmin Tanislav <demonsingur@gmail.com>
---
drivers/media/rc/ir-spi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/media/rc/ir-spi.c b/drivers/media/rc/ir-spi.c
index 50e30e2fae22..0b54ad74cec0 100644
--- a/drivers/media/rc/ir-spi.c
+++ b/drivers/media/rc/ir-spi.c
@@ -21,6 +21,7 @@
#define IR_SPI_DRIVER_NAME "ir-spi"
#define IR_SPI_DEFAULT_FREQUENCY 38000
+#define IR_SPI_BITS_PER_PULSE 16
struct ir_spi_data {
u32 freq;
@@ -70,7 +71,7 @@ static int ir_spi_tx(struct rc_dev *dev, unsigned int *buffer, unsigned int coun
memset(&xfer, 0, sizeof(xfer));
- xfer.speed_hz = idata->freq * 16;
+ xfer.speed_hz = idata->freq * IR_SPI_BITS_PER_PULSE;
xfer.len = len * sizeof(*tx_buf);
xfer.tx_buf = tx_buf;
@@ -98,6 +99,9 @@ static int ir_spi_set_tx_carrier(struct rc_dev *dev, u32 carrier)
if (!carrier)
return -EINVAL;
+ if (carrier > idata->spi->max_speed_hz / IR_SPI_BITS_PER_PULSE)
+ return -EINVAL;
+
idata->freq = carrier;
return 0;
--
2.49.0
next prev parent reply other threads:[~2025-06-13 11:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-13 11:21 [PATCH v5 0/3] media: rc: ir-spi: allocate buffer dynamically Cosmin Tanislav
2025-06-13 11:21 ` [PATCH v5 1/3] " Cosmin Tanislav
2025-06-13 11:21 ` Cosmin Tanislav [this message]
2025-06-13 11:21 ` [PATCH v5 3/3] media: rc: ir-spi: avoid overflow in multiplication Cosmin Tanislav
2025-06-20 16:45 ` [PATCH v5 0/3] media: rc: ir-spi: allocate buffer dynamically Sean Young
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=20250613112210.22731-3-demonsingur@gmail.com \
--to=demonsingur@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.