diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-11-04 23:04:44 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-11-04 23:04:44 +0300 |
| commit | f8f93bc9d2a29c81cc6a4e6d7c87a6f712dbbeeb (patch) | |
| tree | 7e07960f43f7a6c985f75ee5b629121e9799bfdb /kernel/power/suspend.c | |
| parent | bdc3478f90cd4d2928197f36629d5cf93b64dbe9 (diff) | |
| parent | 0b203d699e08424288b5f3eab1347143dd5d1e68 (diff) | |
| download | linux-f8f93bc9d2a29c81cc6a4e6d7c87a6f712dbbeeb.tar.xz | |
Merge tag 'asoc-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.9
The most important fix in here is a change which removes the #error
making the topology API unusable as-is since we have recently discovered
some production uses on Chromebooks so need to acknowledge that what
we've got there now is an ABI.
There's also a very big batch of driver specific fixes here which have
kept on being delayed due to more arriving so the update is another of
these bigger than I would like ones. There is one especially big one in
there, for the Qualcomm code which fixes simultaneous playback and
capture which was broken during the merge window. The diff for that is
large because it moves blocks of code to different functions but it's
functionally fairly simple and if it breaks it should have been very
obvious in testing.
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 1e7f5da648d9..6ccb08f57fcb 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -498,9 +498,9 @@ static int enter_state(suspend_state_t state) #ifndef CONFIG_SUSPEND_SKIP_SYNC trace_suspend_resume(TPS("sync_filesystems"), 0, true); - printk(KERN_INFO "PM: Syncing filesystems ... "); + pr_info("PM: Syncing filesystems ... "); sys_sync(); - printk("done.\n"); + pr_cont("done.\n"); trace_suspend_resume(TPS("sync_filesystems"), 0, false); #endif |