Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
f30c14b6
Commit
f30c14b6
authored
Mar 29, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/misc' into for-linus
parents
12180024
5cd165e7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
sound/core/pcm_lib.c
sound/core/pcm_lib.c
+4
-2
sound/pci/ac97/ac97_patch.c
sound/pci/ac97/ac97_patch.c
+2
-0
No files found.
sound/core/pcm_lib.c
View file @
f30c14b6
...
...
@@ -148,6 +148,9 @@ static void pcm_debug_name(struct snd_pcm_substream *substream,
#define xrun_debug(substream, mask) \
((substream)->pstr->xrun_debug & (mask))
#else
#define xrun_debug(substream, mask) 0
#endif
#define dump_stack_on_xrun(substream) do { \
if (xrun_debug(substream, XRUN_DEBUG_STACK)) \
...
...
@@ -169,6 +172,7 @@ static void xrun(struct snd_pcm_substream *substream)
}
}
#ifdef CONFIG_SND_PCM_XRUN_DEBUG
#define hw_ptr_error(substream, fmt, args...) \
do { \
if (xrun_debug(substream, XRUN_DEBUG_BASIC)) { \
...
...
@@ -255,8 +259,6 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
#else
/* ! CONFIG_SND_PCM_XRUN_DEBUG */
#define xrun_debug(substream, mask) 0
#define xrun(substream) do { } while (0)
#define hw_ptr_error(substream, fmt, args...) do { } while (0)
#define xrun_log(substream, pos) do { } while (0)
#define xrun_log_show(substream) do { } while (0)
...
...
sound/pci/ac97/ac97_patch.c
View file @
f30c14b6
...
...
@@ -1852,12 +1852,14 @@ static unsigned int ad1981_jacks_blacklist[] = {
0x10140523
,
/* Thinkpad R40 */
0x10140534
,
/* Thinkpad X31 */
0x10140537
,
/* Thinkpad T41p */
0x1014053e
,
/* Thinkpad R40e */
0x10140554
,
/* Thinkpad T42p/R50p */
0x10140567
,
/* Thinkpad T43p 2668-G7U */
0x10140581
,
/* Thinkpad X41-2527 */
0x10280160
,
/* Dell Dimension 2400 */
0x104380b0
,
/* Asus A7V8X-MX */
0x11790241
,
/* Toshiba Satellite A-15 S127 */
0x1179ff10
,
/* Toshiba P500 */
0x144dc01a
,
/* Samsung NP-X20C004/SEG */
0
/* end */
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment