| Message ID | 1430384261-5373-1-git-send-email-peter.ujfalusi@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 27796e755a2fc6707cdf9b484a56395f703e4f3d |
| Headers | show |
On Thu, Apr 30, 2015 at 11:57:41AM +0300, Peter Ujfalusi wrote: > pm_runtime_enabled() will only tell if the pm runtime has been enabled for > the device, which is done at probe time but will not tell the actual power > state of the device. > pm_runtime_active() provides this information. > This patch fixes a kernel crash when doing suspend when McASP is not > active. Applied, thanks.
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index ddf7e97d8f0b..1ab3fcdc6bba 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1247,7 +1247,7 @@ static int davinci_mcasp_suspend(struct snd_soc_dai *dai) u32 reg; int i; - context->pm_state = pm_runtime_enabled(mcasp->dev); + context->pm_state = pm_runtime_active(mcasp->dev); if (!context->pm_state) pm_runtime_get_sync(mcasp->dev);
pm_runtime_enabled() will only tell if the pm runtime has been enabled for the device, which is done at probe time but will not tell the actual power state of the device. pm_runtime_active() provides this information. This patch fixes a kernel crash when doing suspend when McASP is not active. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- Mark, can you schedule this for the next -rc? Thank you, Peter sound/soc/davinci/davinci-mcasp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)