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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: Fix compile warning in wm8750.c
  ASoC: omap: Update e-mail address of Jarkko Nikula
  ASoC: SAMSUNG: Add I2S0 internal dma driver
  ASoC: Terminate WM8750 SPI device ID table
  ASoC: Add missing break in WM8994 probe
  ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc
  ALSA: azt3328 - adjust error handling code to include debugging code
  ALSA: hda - Add CONFIG_SND_HDA_POWER_SAVE to stac_vrefout_set()
  ALSA: usb-audio - Add quirk for BOSS Micro BR-80
  ASoC: Fix typo in wm8750 spi_ids
  ASoC: Fix warning in Speyside WM8962
  ASoC: Fix SPI driver binding for WM8987
  ASoC: Fix binding of WM8750 on Jive
  ASoC: WM8903: Free IRQ on device removal
  ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module
  ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS
parents 4c74916f c012cdc8

MAINTAINERS

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



OMAP AUDIO SUPPORT

M:	Jarkko Nikula <jhnikula@gmail.com>

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

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

L:	linux-omap@vger.kernel.org

S:	Maintained

include/sound/tlv320aic3x.h

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

 * Platform data for Texas Instruments TLV320AIC3x codec

 *

 * Author: Jarkko Nikula <jhnikula@gmail.com>

 * Author: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *

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

 * it under the terms of the GNU General Public License version 2 as

sound/pci/azt3328.c

+7 −4
Original line number Diff line number Diff line
@@ -2625,16 +2625,19 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 
	int err;



	snd_azf3328_dbgcallenter();

	if (dev >= SNDRV_CARDS)

		return -ENODEV;

	if (dev >= SNDRV_CARDS) {

		err = -ENODEV;

		goto out;

	}

	if (!enable[dev]) {

		dev++;

		return -ENOENT;

		err = -ENOENT;

		goto out;

	}



	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);

	if (err < 0)

		return err;

		goto out;



	strcpy(card->driver, "AZF3328");

	strcpy(card->shortname, "Aztech AZF3328 (PCI168)");

sound/pci/hda/patch_sigmatel.c

+2 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



#ifdef CONFIG_SND_HDA_POWER_SAVE

static int stac_vrefout_set(struct hda_codec *codec,

					hda_nid_t nid, unsigned int new_vref)

{
@@ -696,6 +697,7 @@ static int stac_vrefout_set(struct hda_codec *codec, 


	return 1;

}

#endif



static unsigned int stac92xx_vref_set(struct hda_codec *codec,

					hda_nid_t nid, unsigned int new_vref)

sound/soc/codecs/wm8750.c

+8 −0
Original line number Diff line number Diff line
@@ -778,11 +778,19 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) 
	return 0;

}



static const struct spi_device_id wm8750_spi_ids[] = {

	{ "wm8750", 0 },

	{ "wm8987", 0 },

	{ },

};

MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);



static struct spi_driver wm8750_spi_driver = {

	.driver = {

		.name	= "wm8750-codec",

		.owner	= THIS_MODULE,

	},

	.id_table	= wm8750_spi_ids,

	.probe		= wm8750_spi_probe,

	.remove		= __devexit_p(wm8750_spi_remove),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE