diff options
author | Greg Kroah-Hartman | 2014-07-21 19:07:25 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2014-07-21 19:07:25 +0200 |
commit | 90125edbc49ec58b9101c4271bb1d87b04a4620f (patch) | |
tree | 068353d4234435b17ade687b50a5d5015bdf1ad9 /Documentation/DocBook/writing-an-alsa-driver.tmpl | |
parent | test: add firmware_class loader test (diff) | |
parent | Linux 3.16-rc6 (diff) | |
download | kernel-qcow2-linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.tar.gz kernel-qcow2-linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.tar.xz kernel-qcow2-linux-90125edbc49ec58b9101c4271bb1d87b04a4620f.zip |
Merge 3.16-rc6 into driver-core-next
We want the platform changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/DocBook/writing-an-alsa-driver.tmpl')
-rw-r--r-- | Documentation/DocBook/writing-an-alsa-driver.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index d0056a4e9c53..6f639d9530b5 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl @@ -5696,7 +5696,7 @@ struct _snd_pcm_runtime { suspending the PCM operations via <function>snd_pcm_suspend_all()</function> or <function>snd_pcm_suspend()</function>. It means that the PCM - streams are already stoppped when the register snapshot is + streams are already stopped when the register snapshot is taken. But, remember that you don't have to restart the PCM stream in the resume callback. It'll be restarted via trigger call with <constant>SNDRV_PCM_TRIGGER_RESUME</constant> |