[PATCH v2] iio: pressure: dps310: read the first temperature in probe
From: Rupesh Majhi
Date: Sat Nov 21 2026 - 13:25:37 EST
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@xxxxxxxxx>
---
v2: return inside the guard scope (Andy)
v1: https://lore.kernel.org/linux-iio/20261119190827.36947-1-zoone.rupert@xxxxxxxxx/
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@xxxxxxxxx>
Cc: Jonathan Cameron <jonathan.cameron@xxxxxxxxxxxxxxxx>
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