diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 08:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-29 08:47:53 -0700 |
| commit | 44ada1a147fa28ae15b83a031c48fc2b992cc3ef (patch) | |
| tree | 253d910ef02c8c864fffce7b70bcc7c68697df2b /Documentation | |
| parent | b8e7e40abeac49644fec4a4f52ffe74c7b05eca0 (diff) | |
| parent | 817682c11bb836cfe688b5601aa66f2b58a4848e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Compaq Presario CQ60 patching for Conexant
sound: usb-audio: make the MotU Fastlane work again
ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode
ALSA: Fix invalid jiffies check after pause
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/Procfile.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt index bba2dbb79d8..cfac20cf9e3 100644 --- a/Documentation/sound/alsa/Procfile.txt +++ b/Documentation/sound/alsa/Procfile.txt @@ -104,6 +104,11 @@ card*/pcm*/xrun_debug When this value is greater than 1, the driver will show the stack trace additionally. This may help the debugging. + Since 2.6.30, this option also enables the hwptr check using + jiffies. This detects spontaneous invalid pointer callback + values, but can be lead to too much corrections for a (mostly + buggy) hardware that doesn't give smooth pointer updates. + card*/pcm*/sub*/info The general information of this PCM sub-stream. |