From: Cong Nguyen <congnt264@gmail.com>
To: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Shawn Tu <shawnx.tu@intel.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] media: i2c: hi556: fix power leak on remove while runtime-active
Date: Mon, 28 Sep 2026 20:51:40 +0700 [thread overview]
Message-ID: <20260928135140.2354361-1-congnt264@gmail.com> (raw)
hi556_remove() calls pm_runtime_disable() but never hi556_suspend().
pm_runtime_disable() only blocks future auto suspend/resume, it
doesn't force a final one -- if unbound while hi556_set_stream() is
holding an outstanding PM reference (removed while still streaming),
the device stays genuinely active with regulators/clock enabled
forever after.
probe()'s own error path already shows the right pairing (calls
hi556_suspend() when powered on). Do the same in remove(), guarded by
pm_runtime_status_suspended() so the common already-suspended case
isn't suspended twice -- same guard sibling imx412.c's remove() uses.
Moved remove() after suspend()/resume()'s definitions since it now
calls them directly.
Fixes: e62138403a84 ("media: hi556: Add support for Hi-556 sensor")
Assisted-by: LLM
Signed-off-by: Cong Nguyen <congnt264@gmail.com>
---
drivers/media/i2c/hi556.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c
index de573cee4451..45d1366c6d5a 100644
--- a/drivers/media/i2c/hi556.c
+++ b/drivers/media/i2c/hi556.c
@@ -1264,18 +1264,6 @@ static int hi556_check_hwcfg(struct device *dev)
return ret;
}
-static void hi556_remove(struct i2c_client *client)
-{
- struct v4l2_subdev *sd = i2c_get_clientdata(client);
- struct hi556 *hi556 = to_hi556(sd);
-
- v4l2_async_unregister_subdev(sd);
- media_entity_cleanup(&sd->entity);
- v4l2_ctrl_handler_free(sd->ctrl_handler);
- pm_runtime_disable(hi556->dev);
- mutex_destroy(&hi556->mutex);
-}
-
static int hi556_suspend(struct device *dev)
{
struct v4l2_subdev *sd = dev_get_drvdata(dev);
@@ -1316,6 +1304,20 @@ static int hi556_resume(struct device *dev)
return 0;
}
+static void hi556_remove(struct i2c_client *client)
+{
+ struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ struct hi556 *hi556 = to_hi556(sd);
+
+ v4l2_async_unregister_subdev(sd);
+ media_entity_cleanup(&sd->entity);
+ v4l2_ctrl_handler_free(sd->ctrl_handler);
+ pm_runtime_disable(hi556->dev);
+ if (!pm_runtime_status_suspended(hi556->dev))
+ hi556_suspend(hi556->dev);
+ mutex_destroy(&hi556->mutex);
+}
+
static int hi556_probe(struct i2c_client *client)
{
struct hi556 *hi556;
--
2.25.1
next reply other threads:[~2026-09-28 13:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-28 13:51 Cong Nguyen [this message]
2026-09-28 14:33 ` Sakari Ailus
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=20260928135140.2354361-1-congnt264@gmail.com \
--to=congnt264@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=shawnx.tu@intel.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®