Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120249
b: refs/heads/master
c: fde22f2
h: refs/heads/master
i:
  120247: 33187de
v: v3
  • Loading branch information
Mark Brown committed Nov 24, 2008
1 parent 8653274 commit 5284896
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 67c91513b81a101800f113013234d2ab06bc5e52
refs/heads/master: fde22f272dad4fef7ba611e3f75fa94f7b43fae6
8 changes: 4 additions & 4 deletions trunk/sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ static void soc_resume_deferred(struct work_struct *work)
* so userspace apps are blocked from touching us
*/

dev_info(socdev->dev, "starting resume work\n");
dev_dbg(socdev->dev, "starting resume work\n");

if (card->resume_pre)
card->resume_pre(pdev);
Expand Down Expand Up @@ -736,7 +736,7 @@ static void soc_resume_deferred(struct work_struct *work)
if (card->resume_post)
card->resume_post(pdev);

dev_info(socdev->dev, "resume work completed\n");
dev_dbg(socdev->dev, "resume work completed\n");

/* userspace can access us now we are back as we were before */
snd_power_change_state(codec->card, SNDRV_CTL_POWER_D0);
Expand All @@ -747,10 +747,10 @@ static int soc_resume(struct platform_device *pdev)
{
struct snd_soc_device *socdev = platform_get_drvdata(pdev);

dev_info(socdev->dev, "scheduling resume work\n");
dev_dbg(socdev->dev, "scheduling resume work\n");

if (!schedule_work(&socdev->deferred_resume_work))
dev_err(socdev->dev, "work item may be lost\n");
dev_err(socdev->dev, "resume work item may be lost\n");

return 0;
}
Expand Down

0 comments on commit 5284896

Please sign in to comment.