diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-29 08:40:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-29 08:40:50 +0200 |
| commit | f30c14b64e0eb62319e7a3e930fb7ea2bee9d919 (patch) | |
| tree | 0e94958c73881c3bbcd646989a6e3e6fe0904ac7 /sound | |
| parent | 12180024cc22c0a67642ffa10e7069796e32969d (diff) | |
| parent | 5cd165e7057020884e430941c24454d3df9a799d (diff) | |
| download | linux-stable-f30c14b64e0eb62319e7a3e930fb7ea2bee9d919.tar.gz linux-stable-f30c14b64e0eb62319e7a3e930fb7ea2bee9d919.tar.bz2 linux-stable-f30c14b64e0eb62319e7a3e930fb7ea2bee9d919.zip | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/pcm_lib.c | 6 | ||||
| -rw-r--r-- | sound/pci/ac97/ac97_patch.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index b546ac2660f9..a2ff86189d2a 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -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) diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 1caf5e3c1f6a..e68c98ef4041 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -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 */ }; |