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

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

Merge branch 'fix/hda' into topic/hda 



Conflicts:
	sound/pci/hda/patch_conexant.c

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 83b0c6ba c817eebe

Documentation/sound/alsa/HD-Audio-Models.txt

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ ALC680 


ALC882/883/885/888/889

======================

  N/A

  acer-aspire-4930g	Acer Aspire 4930G/5930G/6530G/6930G/7730G

  acer-aspire-8930g	Acer Aspire 8330G/6935G

  acer-aspire		Acer Aspire others



ALC861/660

==========

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -4807,6 +4807,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c 
F:	arch/arm/mach-omap2/clockdomain44xx.c



OMAP AUDIO SUPPORT

M:	Peter Ujfalusi <peter.ujfalusi@ti.com>

M:	Jarkko Nikula <jarkko.nikula@bitmer.com>

L:	alsa-devel@alsa-project.org (subscribers-only)

L:	linux-omap@vger.kernel.org
@@ -7462,8 +7463,7 @@ F: include/linux/wm97xx.h 


WOLFSON MICROELECTRONICS DRIVERS

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Ian Lartey <ian@opensource.wolfsonmicro.com>

M:	Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

L:	patches@opensource.wolfsonmicro.com

T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc

T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus

W:	http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices

include/sound/core.h

+10 −0
Original line number Diff line number Diff line
@@ -325,6 +325,13 @@ void release_and_free_resource(struct resource *res); 


/* --- */



/* sound printk debug levels */

enum {

	SND_PR_ALWAYS,

	SND_PR_DEBUG,

	SND_PR_VERBOSE,

};



#if defined(CONFIG_SND_DEBUG) || defined(CONFIG_SND_VERBOSE_PRINTK)

__printf(4, 5)

void __snd_printk(unsigned int level, const char *file, int line,
@@ -354,6 +361,8 @@ void __snd_printk(unsigned int level, const char *file, int line, 
 */

#define snd_printd(fmt, args...) \

	__snd_printk(1, __FILE__, __LINE__, fmt, ##args)

#define _snd_printd(level, fmt, args...) \

	__snd_printk(level, __FILE__, __LINE__, fmt, ##args)



/**

 * snd_BUG - give a BUG warning message and stack trace
@@ -383,6 +392,7 @@ void __snd_printk(unsigned int level, const char *file, int line, 
#else /* !CONFIG_SND_DEBUG */



#define snd_printd(fmt, args...)	do { } while (0)

#define _snd_printd(level, fmt, args...) do { } while (0)

#define snd_BUG()			do { } while (0)

static inline int __snd_bug_on(int cond)

{

sound/core/vmaster.c

+1 −0
Original line number Diff line number Diff line
@@ -419,6 +419,7 @@ EXPORT_SYMBOL(snd_ctl_make_virtual_master); 
 * snd_ctl_add_vmaster_hook - Add a hook to a vmaster control

 * @kcontrol: vmaster kctl element

 * @hook: the hook function

 * @private_data: the private_data pointer to be saved

 *

 * Adds the given hook to the vmaster control element so that it's called

 * at each time when the value is changed.

sound/isa/sscape.c

+4 −2
Original line number Diff line number Diff line
@@ -1019,13 +1019,15 @@ static int __devinit create_sscape(int dev, struct snd_card *card) 
	irq_cfg = get_irq_config(sscape->type, irq[dev]);

	if (irq_cfg == INVALID_IRQ) {

		snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", irq[dev]);

		return -ENXIO;

		err = -ENXIO;

		goto _release_dma;

	}



	mpu_irq_cfg = get_irq_config(sscape->type, mpu_irq[dev]);

	if (mpu_irq_cfg == INVALID_IRQ) {

		snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]);

		return -ENXIO;

		err = -ENXIO;

		goto _release_dma;

	}



	/*