Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f30c14b6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus

parents 12180024 5cd165e7

sound/core/pcm_lib.c

+4 −2
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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 */

};