LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Shrirang Bagul <shrirang.bagul@canonical.com>
To: jic23@kernel.org
Cc: lorenzo.bianconi83@gmail.com, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] iio: humidity: hts221: Fix sensor reads after resume
Date: Mon, 30 Apr 2018 12:25:46 +0800 [thread overview]
Message-ID: <20180430042546.8801-1-shrirang.bagul@canonical.com> (raw)
CTRL1 register (ODR & BDU settings) gets reset after system comes back
from suspend, causing subsequent reads from the sensor to fail.
This patch restores the CTRL1 register after resume.
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes-for-4.14b
Since 4.17.rc1, this driver uses REGMAP; I'll send a separate patch to
address this issue.
Cc: stable@vger.kernel.org
Fixes: ffebe74b7c95 (iio: humidity: hts221: avoid useless ODR reconfiguration)
Signed-off-by: Shrirang Bagul <shrirang.bagul@canonical.com>
---
drivers/iio/humidity/hts221_core.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
index 32524a8dc66f..fed2da64fa3b 100644
--- a/drivers/iio/humidity/hts221_core.c
+++ b/drivers/iio/humidity/hts221_core.c
@@ -674,11 +674,15 @@ static int __maybe_unused hts221_resume(struct device *dev)
struct hts221_hw *hw = iio_priv(iio_dev);
int err = 0;
- if (hw->enabled)
- err = hts221_write_with_mask(hw, HTS221_REG_CNTRL1_ADDR,
- HTS221_ENABLE_MASK, true);
+ err = hts221_write_with_mask(hw, HTS221_REG_CNTRL1_ADDR,
+ HTS221_BDU_MASK, 1);
+ if (err < 0)
+ goto fail_err;
- return err;
+ err = hts221_update_odr(hw, hw->odr);
+
+fail_err:
+ return err < 0 ? err : 0;
}
const struct dev_pm_ops hts221_pm_ops = {
--
2.14.1
next reply other threads:[~2018-04-30 4:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-30 4:25 Shrirang Bagul [this message]
2018-05-06 16:19 ` Jonathan Cameron
2018-05-07 2:21 ` Shrirang Bagul
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=20180430042546.8801-1-shrirang.bagul@canonical.com \
--to=shrirang.bagul@canonical.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.bianconi83@gmail.com \
--subject='Re: [PATCH] iio: humidity: hts221: Fix sensor reads after resume' \
/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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).