Skip to content

Commit ac3e038

Browse files
jwrdegoedegregkh
authored andcommitted
misc: lis3lv02d_i2c: Fix regulators getting en-/dis-abled twice on suspend/resume
When not configured for wakeup lis3lv02d_i2c_suspend() will call lis3lv02d_poweroff() even if the device has already been turned off by the runtime-suspend handler and if configured for wakeup and the device is runtime-suspended at this point then it is not turned back on to serve as a wakeup source. Before commit b1b9f7a ("misc: lis3lv02d_i2c: Add missing setting of the reg_ctrl callback"), lis3lv02d_poweroff() failed to disable the regulators which as a side effect made calling poweroff() twice ok. Now that poweroff() correctly disables the regulators, doing this twice triggers a WARN() in the regulator core: unbalanced disables for regulator-dummy WARNING: CPU: 1 PID: 92 at drivers/regulator/core.c:2999 _regulator_disable ... Fix lis3lv02d_i2c_suspend() to not call poweroff() a second time if already runtime-suspended and add a poweron() call when necessary to make wakeup work. lis3lv02d_i2c_resume() has similar issues, with an added weirness that it always powers on the device if it is runtime suspended, after which the first runtime-resume will call poweron() again, causing the enabled count for the regulator to increase by 1 every suspend/resume. These unbalanced regulator_enable() calls cause the regulator to never be turned off and trigger the following WARN() on driver unbind: WARNING: CPU: 1 PID: 1724 at drivers/regulator/core.c:2396 _regulator_put Fix this by making lis3lv02d_i2c_resume() mirror the new suspend(). Fixes: b1b9f7a ("misc: lis3lv02d_i2c: Add missing setting of the reg_ctrl callback") Reported-by: Paul Menzel <pmenzel@molgen.mpg.de> Closes: https://lore.kernel.org/regressions/5fc6da74-af0a-4aac-b4d5-a000b39a63a5@molgen.mpg.de/ Cc: stable@vger.kernel.org Cc: regressions@lists.linux.dev Signed-off-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Paul Menzel <pmenzel@molgen.mpg.de> # Dell XPS 15 7590 Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> Link: https://lore.kernel.org/r/20240220190035.53402-1-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent da85c25 commit ac3e038

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

drivers/misc/lis3lv02d/lis3lv02d_i2c.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,14 @@ static int lis3lv02d_i2c_suspend(struct device *dev)
198198
struct i2c_client *client = to_i2c_client(dev);
199199
struct lis3lv02d *lis3 = i2c_get_clientdata(client);
200200

201-
if (!lis3->pdata || !lis3->pdata->wakeup_flags)
201+
/* Turn on for wakeup if turned off by runtime suspend */
202+
if (lis3->pdata && lis3->pdata->wakeup_flags) {
203+
if (pm_runtime_suspended(dev))
204+
lis3lv02d_poweron(lis3);
205+
/* For non wakeup turn off if not already turned off by runtime suspend */
206+
} else if (!pm_runtime_suspended(dev))
202207
lis3lv02d_poweroff(lis3);
208+
203209
return 0;
204210
}
205211

@@ -208,13 +214,12 @@ static int lis3lv02d_i2c_resume(struct device *dev)
208214
struct i2c_client *client = to_i2c_client(dev);
209215
struct lis3lv02d *lis3 = i2c_get_clientdata(client);
210216

211-
/*
212-
* pm_runtime documentation says that devices should always
213-
* be powered on at resume. Pm_runtime turns them off after system
214-
* wide resume is complete.
215-
*/
216-
if (!lis3->pdata || !lis3->pdata->wakeup_flags ||
217-
pm_runtime_suspended(dev))
217+
/* Turn back off if turned on for wakeup and runtime suspended*/
218+
if (lis3->pdata && lis3->pdata->wakeup_flags) {
219+
if (pm_runtime_suspended(dev))
220+
lis3lv02d_poweroff(lis3);
221+
/* For non wakeup turn back on if not runtime suspended */
222+
} else if (!pm_runtime_suspended(dev))
218223
lis3lv02d_poweron(lis3);
219224

220225
return 0;

0 commit comments

Comments
 (0)