projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
052a7fd
)
Revert "i2c: tegra: Fix suspending in active runtime PM state"
author
Thierry Reding
<treding@nvidia.com>
Thu, 30 Apr 2020 11:31:58 +0000
(13:31 +0200)
committer
Sasha Levin
<sashal@kernel.org>
Tue, 30 Jun 2020 19:36:47 +0000
(15:36 -0400)
[ Upstream commit
78ad73421831247e46c31899a7bead02740e4bef
]
This reverts commit
9f42de8d4ec2304f10bbc51dc0484f3503d61196
.
It's not safe to use pm_runtime_force_{suspend,resume}(), especially
during the noirq phase of suspend. See also the guidance provided in
commit
1e2ef05bb8cf
("PM: Limit race conditions between runtime PM
and system sleep (v2)").
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/i2c/busses/i2c-tegra.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-tegra.c
b/drivers/i2c/busses/i2c-tegra.c
index
dbc43cf
..
331f7cc
100644
(file)
--- a/
drivers/i2c/busses/i2c-tegra.c
+++ b/
drivers/i2c/busses/i2c-tegra.c
@@
-1719,14
+1719,9
@@
static int tegra_i2c_remove(struct platform_device *pdev)
static int __maybe_unused tegra_i2c_suspend(struct device *dev)
{
struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
- int err;
i2c_mark_adapter_suspended(&i2c_dev->adapter);
- err = pm_runtime_force_suspend(dev);
- if (err < 0)
- return err;
-
return 0;
}
@@
-1747,10
+1742,6
@@
static int __maybe_unused tegra_i2c_resume(struct device *dev)
if (err)
return err;
- err = pm_runtime_force_resume(dev);
- if (err < 0)
- return err;
-
i2c_mark_adapter_resumed(&i2c_dev->adapter);
return 0;