From f9f5715c7494e46d84965155ab9827313bfca188 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 25 Jan 2012 19:53:58 +0000 Subject: [PATCH] --- yaml --- r: 293250 b: refs/heads/master c: fb644e9ce02a6965a2419325a03a9ea531840bcd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dapm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8b80478baef2..b5af62bf1b58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5315a23ccdf921c838d26df6360b439c8d7ac83 +refs/heads/master: fb644e9ce02a6965a2419325a03a9ea531840bcd diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 30f9b5c71eee..4973545f2a32 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/sound/soc/soc-dapm.c @@ -1285,7 +1285,7 @@ static void dapm_post_sequence_async(void *data, async_cookie_t cookie) dev_err(d->dev, "Failed to turn off bias: %d\n", ret); if (d->dev) - pm_runtime_put_sync(d->dev); + pm_runtime_put(d->dev); } /* If we just powered up then move to active bias */