diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-08 01:07:06 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-22 08:04:49 -0700 |
| commit | 4f3530f4a41d49c41015020cd9a5ed5c95b5d2db (patch) | |
| tree | 59a888b824dec46ebf3a5b3018044458b02fd352 /drivers/bus | |
| parent | 0ef8e3bb974af56346b34393e643d491d9141c66 (diff) | |
| download | linux-4f3530f4a41d49c41015020cd9a5ed5c95b5d2db.tar.gz linux-4f3530f4a41d49c41015020cd9a5ed5c95b5d2db.tar.bz2 linux-4f3530f4a41d49c41015020cd9a5ed5c95b5d2db.zip | |
bus: ti-sysc: Fix no_console_suspend handling
If no_console_suspend is set, we should keep console enabled during suspend.
Lets fix this by only producing a warning if we can't idle hardware during
suspend.
Fixes: ef55f8215a78 ("bus: ti-sysc: Improve suspend and resume handling")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index b31bf03ea497..4576a1268e0e 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1175,10 +1175,10 @@ static int sysc_child_suspend_noirq(struct device *dev) if (!pm_runtime_status_suspended(dev)) { error = pm_generic_runtime_suspend(dev); if (error) { - dev_err(dev, "%s error at %i: %i\n", - __func__, __LINE__, error); + dev_warn(dev, "%s busy at %i: %i\n", + __func__, __LINE__, error); - return error; + return 0; } error = sysc_runtime_suspend(ddata->dev); |