Commit 34ea1ab2 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] runtime PM deadlock fix

From: Alexander Atanasov <alex@ssi.bg>

dpm_runtime_suspend holds dpm_sem and calls dpm_runtime_resume which
deadlocks.  Directly call runtime_resume instead.
parent ffaf2ab6
...@@ -51,7 +51,7 @@ int dpm_runtime_suspend(struct device * dev, u32 state) ...@@ -51,7 +51,7 @@ int dpm_runtime_suspend(struct device * dev, u32 state)
goto Done; goto Done;
if (dev->power.power_state) if (dev->power.power_state)
dpm_runtime_resume(dev); runtime_resume(dev);
if (!(error = suspend_device(dev,state))) if (!(error = suspend_device(dev,state)))
dev->power.power_state = state; dev->power.power_state = state;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment