Commit a1ada086 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 - A series of fixes for Conexant 20549 HD-audio codec chip
 - A workaround for HDMI hotplug debug prints that annoyed people
 - A fix for the new support of platform DAPM contexts
 - Many driver-specific minor fixes

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - hide HDMI/ELD printks unless snd.debug=2
  ALSA: sound/isa/sscape.c: add missing resource-release code
  sound: sound/oss/msnd_pinnacle.c: add vfrees
  ALSA: hda - clean up CX20549 test mixer setup
  ALSA: hda - CX20549 doesn't need pin_amp_workaround.
  ALSA: hda - Remove CD control from model=benq for CX20549
  ALSA: hda - fix record volume controls of CX20459 ("Venice")
  ALSA: hda - Rename capture sources of CX20549 to match common conventions
  ALSA: hda - Fix proc output for ADC amp values of CX20549
  ASoC: tegra: fix i2s compilation when !CONFIG_DEBUG_FS
  ASoC: set idle_bias_off=1 for all platform DAPM contexts
  ASoC: imx-audmux: Check for NULL pointer
  ASoC: imx-audmux: Fix ssi port numbers in sysfs
  ASoC: ak4642: fixup: mute needs +1 step
  MAINTAINERS: Don't list everyone working on Wolfson drivers
  MAINTAINERS: Add missing ASoC OMAP co-maintainer
  ASoC: pxa: pxa2xx-i2s: add io.h for IOMEM macro
  ASoC: tegra: ensure clocks are enabled when touching registers
  ASoC: sgtl5000: Enable VAG when DAC/ADC up
  ALSA: asihpi - fix return value of hpios_locked_mem_alloc()
parents 39f86a60 fae3d88a

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -4803,6 +4803,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
@@ -7461,8 +7462,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/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;

	}



	/*

sound/oss/msnd_pinnacle.c

+6 −2
Original line number Diff line number Diff line
@@ -1294,6 +1294,8 @@ static int __init calibrate_adc(WORD srate) 


static int upload_dsp_code(void)

{

	int ret = 0;



	msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS);

#ifndef HAVE_DSPCODEH

	INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE);
@@ -1312,7 +1314,8 @@ static int upload_dsp_code(void) 
	memcpy_toio(dev.base, PERMCODE, PERMCODESIZE);

	if (msnd_upload_host(&dev, INITCODE, INITCODESIZE) < 0) {

		printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n");

		return -ENODEV;

		ret = -ENODEV;

		goto out;

	}

#ifdef HAVE_DSPCODEH

	printk(KERN_INFO LOGNAME ": DSP firmware uploaded (resident)\n");
@@ -1320,12 +1323,13 @@ static int upload_dsp_code(void) 
	printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n");

#endif



out:

#ifndef HAVE_DSPCODEH

	vfree(INITCODE);

	vfree(PERMCODE);

#endif



	return 0;

	return ret;

}



#ifdef MSND_CLASSIC

sound/pci/asihpi/hpi_internal.h

+2 −2
Original line number Diff line number Diff line 
/******************************************************************************



    AudioScience HPI driver

    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>

    Copyright (C) 1997-2012  AudioScience Inc. <support@audioscience.com>



    This program is free software; you can redistribute it and/or modify

    it under the terms of version 2 of the GNU General Public License as
@@ -42,7 +42,7 @@ On error *pLockedMemHandle marked invalid, non-zero returned. 
If this function succeeds, then HpiOs_LockedMem_GetVirtAddr() and

HpiOs_LockedMem_GetPyhsAddr() will always succed on the returned handle.

*/

int hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,

u16 hpios_locked_mem_alloc(struct consistent_dma_area *p_locked_mem_handle,

							   /**< memory handle */

	u32 size, /**< Size in bytes to allocate */

	struct pci_dev *p_os_reference

CRA Git | Maintained and supported by SUSTech CRA and CCSE