From: Rupesh Majhi <zoone.rupert@gmail.com>
To: "Andy Shevchenko" <andy@kernel.org>,
"David Lechner" <dlechner@baylibre.com>,
"Eddie James" <eajames@linux.ibm.com>,
"Jonathan Cameron" <jic23@kernel.org>,
"Nuno Sá" <nuno.sa@analog.com>,
"Rupesh Majhi" <zoone.rupert@gmail.com>
Cc: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnav Kapoor <kapoorarnav43@gmail.com>
Subject: [PATCH v2] iio: pressure: dps310: read the first temperature in probe
Date: Sat, 21 Nov 2026 20:25:27 +0200 [thread overview]
Message-ID: <20261121182527.34489-1-zoone.rupert@gmail.com> (raw)
The first temperature read is in dps310_fifo_interval() instead of
probe. That function is called with data->lock held and takes it
again, so enabling the buffer without a trigger deadlocks.
Move the read to probe.
Fixes: 903941a9b06a ("iio: pressure: dps310: don't wait for new temperature in trigger handler")
Signed-off-by: Rupesh Majhi <zoone.rupert@gmail.com>
---
v2: return inside the guard scope (Andy)
v1: https://lore.kernel.org/linux-iio/20261119190827.36947-1-zoone.rupert@gmail.com/
Based on iio togreg, fine to squash into 903941a9b06a instead.
Tested on a DPS310 on a BeagleBone Black: enabling the buffer without
a trigger works.
Cc: Arnav Kapoor <kapoorarnav43@gmail.com>
Cc: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>
drivers/iio/pressure/dps310.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/pressure/dps310.c b/drivers/iio/pressure/dps310.c
index 9b52cbc2372a..fc727e5fcd59 100644
--- a/drivers/iio/pressure/dps310.c
+++ b/drivers/iio/pressure/dps310.c
@@ -1058,16 +1058,9 @@ static unsigned int dps310_fifo_interval(struct dps310_data *data,
{
unsigned int drain_interval_ms, fill_ms, want_ms;
int scan_rate;
- int rc;
fill_ms = MSEC_PER_SEC * DPS310_FIFO_DEPTH / (prs_rate + tmp_rate);
- /* Pressure compensation needs a temperature from the start */
- scoped_guard(mutex, &data->lock)
- rc = dps310_read_temp_raw_locked(data);
- if (rc)
- return rc;
-
/*
* There is no hardware watermark, so take it as the number of scans
* the user will wait for and drain at that rate. Scans come from
@@ -1478,6 +1471,13 @@ static int dps310_probe(struct i2c_client *client)
if (rc)
return rc;
+ /* Pressure compensation needs a temperature from the start */
+ scoped_guard(mutex, &data->lock) {
+ rc = dps310_read_temp_raw_locked(data);
+ if (rc)
+ return rc;
+ }
+
/*
* The device measures continuously in background mode, so a triggered
* capture is just a read of the latest results. The setup ops run the
base-commit: 903941a9b06ae445c70646ab061b604c2dea17d3
--
2.43.0
reply other threads:[~2026-11-21 18:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261121182527.34489-1-zoone.rupert@gmail.com \
--to=zoone.rupert@gmail.com \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=eajames@linux.ibm.com \
--cc=jic23@kernel.org \
--cc=jonathan.cameron@oss.qualcomm.com \
--cc=kapoorarnav43@gmail.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nuno.sa@analog.com \
/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
all inboxes | Powered by JetHome®