FAILED: patch "[PATCH] iio: pressure: mpl115: fix runtime PM leak on read error" failed to apply to 6.12-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x fbe67ff37a6fd855a6c097f84f3738bd13d0a898
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071315-trespass-legible-97d4@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From fbe67ff37a6fd855a6c097f84f3738bd13d0a898 Mon Sep 17 00:00:00 2001
From: Biren Pandya <[email protected]>
Date: Sun, 14 Jun 2026 12:45:48 +0530
Subject: [PATCH] iio: pressure: mpl115: fix runtime PM leak on read error
mpl115_read_raw() takes a runtime PM reference with pm_runtime_get_sync() before reading the processed pressure or raw temperature, but on the read error path it returns without calling pm_runtime_put_autosuspend(). Each failed read therefore leaks a runtime PM reference and prevents the device from autosuspending.
Drop the reference before checking the return value so both the success and error paths are balanced.
drivers/iio/pressure/mpl115.c +2 -2
@@ -106,18 +106,18 @@ static int mpl115_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_PROCESSED :pm_runtime_get_sync (data->dev); ret =mpl115_comp_pressure (data, val, val2); +pm_runtime_put_autosuspend (data->dev);if (ret <0 )return ret; -pm_runtime_put_autosuspend (data->dev);return IIO_VAL_INT_PLUS_MICRO ;case IIO_CHAN_INFO_RAW :pm_runtime_get_sync (data->dev);/* temperature -5.35 C / LSB, 472 LSB is 25 C */ ret =mpl115_read_temp (data); +pm_runtime_put_autosuspend (data->dev);if (ret <0 )return ret; -pm_runtime_put_autosuspend (data->dev); *val = ret >>6 ;return IIO_VAL_INT ;
Sasha Levin
maintainerPATCH 1/2 iio: pressure: Remove redundant pm_runtime_mark_last_busy() calls
From: Sakari Ailus <[email protected]>
[ Upstream commit dfb68a8ebb2e8d9af6e356ae0806bfd8e854ab44 ]
pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(), pm_runtime_autosuspend() and pm_request_autosuspend() now include a call to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to pm_runtime_mark_last_busy().
Stable-dep-of: fbe67ff37a6f ("iio: pressure: mpl115: fix runtime PM leak on read error")
--- drivers/iio/pressure/bmp280-core.c | 5 ----- drivers/iio/pressure/icp10100.c | 1 - drivers/iio/pressure/mpl115.c | 2 -- drivers/iio/pressure/zpa2326.c | 2 -- 4 files changed, 10 deletions(-)
drivers/iio/pressure/bmp280-core.c +0 -5
@@ -747,7 +747,6 @@ static int bmp280_read_raw(struct iio_dev *indio_dev,pm_runtime_get_sync (data->dev); ret =bmp280_read_raw_impl (indio_dev, chan, val, val2, mask); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -922,7 +921,6 @@ static int bmp280_write_raw(struct iio_dev *indio_dev,pm_runtime_get_sync (data->dev); ret =bmp280_write_raw_impl (indio_dev, chan, val, val2, mask); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -1951,7 +1949,6 @@ static int bmp580_nvmem_read(void *priv, unsigned int offset, void *val,pm_runtime_get_sync (data->dev); ret =bmp580_nvmem_read_impl (priv, offset, val, bytes); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -2026,7 +2023,6 @@ static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,pm_runtime_get_sync (data->dev); ret =bmp580_nvmem_write_impl (priv, offset, val, bytes); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return ret;
@@ -2634,7 +2630,6 @@ static int bmp280_buffer_postdisable(struct iio_dev *indio_dev) {struct bmp280_data *data =iio_priv (indio_dev); -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return 0 ;
drivers/iio/pressure/icp10100.c +0 -1
@@ -265,7 +265,6 @@ static int icp10100_get_measures(struct icp10100_state *st, (be16_to_cpu (measures[1 ]) >>8 ); *temperature =be16_to_cpu (measures[2 ]); -pm_runtime_mark_last_busy (&st->client->dev); error_measure:pm_runtime_put_autosuspend (&st->client->dev);return ret;
drivers/iio/pressure/mpl115.c +0 -2
@@ -108,7 +108,6 @@ static int mpl115_read_raw(struct iio_dev *indio_dev, ret =mpl115_comp_pressure (data, val, val2);if (ret <0 )return ret; -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev);return IIO_VAL_INT_PLUS_MICRO ;
@@ -118,7 +117,6 @@ static int mpl115_read_raw(struct iio_dev *indio_dev, ret =mpl115_read_temp (data);if (ret <0 )return ret; -pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev); *val = ret >>6 ;
drivers/iio/pressure/zpa2326.c +0 -2
@@ -699,7 +699,6 @@ static void zpa2326_suspend(struct iio_dev *indio_dev)zpa2326_sleep (indio_dev); -pm_runtime_mark_last_busy (parent);pm_runtime_put_autosuspend (parent); }
@@ -710,7 +709,6 @@ static void zpa2326_init_runtime(struct device *parent)pm_runtime_enable (parent);pm_runtime_set_autosuspend_delay (parent,1000 );pm_runtime_use_autosuspend (parent); -pm_runtime_mark_last_busy (parent);pm_runtime_put_autosuspend (parent); }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 iio: pressure: mpl115: fix runtime PM leak on read error
From: Biren Pandya <[email protected]>
[ Upstream commit fbe67ff37a6fd855a6c097f84f3738bd13d0a898 ]
mpl115_read_raw() takes a runtime PM reference with pm_runtime_get_sync() before reading the processed pressure or raw temperature, but on the read error path it returns without calling pm_runtime_put_autosuspend(). Each failed read therefore leaks a runtime PM reference and prevents the device from autosuspending.
Drop the reference before checking the return value so both the success and error paths are balanced.
--- drivers/iio/pressure/mpl115.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/pressure/mpl115.c +2 -2
@@ -106,18 +106,18 @@ static int mpl115_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_PROCESSED :pm_runtime_get_sync (data->dev); ret =mpl115_comp_pressure (data, val, val2); +pm_runtime_put_autosuspend (data->dev);if (ret <0 )return ret; -pm_runtime_put_autosuspend (data->dev);return IIO_VAL_INT_PLUS_MICRO ;case IIO_CHAN_INFO_RAW :pm_runtime_get_sync (data->dev);/* temperature -5.35 C / LSB, 472 LSB is 25 C */ ret =mpl115_read_temp (data); +pm_runtime_put_autosuspend (data->dev);if (ret <0 )return ret; -pm_runtime_put_autosuspend (data->dev); *val = ret >>6 ;return IIO_VAL_INT ;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 1/1 iio: pressure: mpl115: fix runtime PM leak on read error
In reply to [email protected]From: Biren Pandya <[email protected]>
[ Upstream commit fbe67ff37a6fd855a6c097f84f3738bd13d0a898 ]
mpl115_read_raw() takes a runtime PM reference with pm_runtime_get_sync() before reading the processed pressure or raw temperature, but on the read error path it returns without calling pm_runtime_put_autosuspend(). Each failed read therefore leaks a runtime PM reference and prevents the device from autosuspending.
Drop the reference before checking the return value so both the success and error paths are balanced.
--- drivers/iio/pressure/mpl115.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/pressure/mpl115.c +4 -4
@@ -106,20 +106,20 @@ static int mpl115_read_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_PROCESSED :pm_runtime_get_sync (data->dev); ret =mpl115_comp_pressure (data, val, val2); -if (ret <0 ) -return ret;pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev); +if (ret <0 ) +return ret;return IIO_VAL_INT_PLUS_MICRO ;case IIO_CHAN_INFO_RAW :pm_runtime_get_sync (data->dev);/* temperature -5.35 C / LSB, 472 LSB is 25 C */ ret =mpl115_read_temp (data); -if (ret <0 ) -return ret;pm_runtime_mark_last_busy (data->dev);pm_runtime_put_autosuspend (data->dev); +if (ret <0 ) +return ret; *val = ret >>6 ;return IIO_VAL_INT ;
Signature · 1 line
2.53.0