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

Commit 4ac08d36 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:
  ALSA: ASoC: Fix WM9713 ALC Decay Time name
  ALSA: ASoC: Fix some minor errors in mpc5200 psc i2s driver
  ALSA: ASoC: Fix mono controls after conversion to support full int masks
  ALSA: sound/ice1712: indentation & braces disagree - add braces
  ALSA: usb - Add quirk for Edirol UA-25EX advanced modes
  sound: struct device - replace bus_id with dev_name(), dev_set_name()
  ALSA: hda - Add reboot notifier
  ALSA: Warn when control names are truncated
  ALSA: intel8x0 - add Dell Optiplex GX620 (AD1981B) to AC97 clock whitelist
  ALSA: hda - Fix SPDIF mute on IDT/STAC codecs
  ALSA: hda: Add HDA vendor ID for Wolfson Microelectronics
  ALSA: hda - Add another HP model for AD1884A
parents 0b54968f 71c21b4c

include/sound/soc.h

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
 */

#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert})

	{.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \

	.invert = xinvert})

#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .max = xmax, .invert = xinvert})

sound/core/control.c

+6 −1
Original line number Diff line number Diff line
@@ -225,8 +225,13 @@ struct snd_kcontrol *snd_ctl_new1(const struct snd_kcontrol_new *ncontrol, 
	kctl.id.iface = ncontrol->iface;

	kctl.id.device = ncontrol->device;

	kctl.id.subdevice = ncontrol->subdevice;

	if (ncontrol->name)

	if (ncontrol->name) {

		strlcpy(kctl.id.name, ncontrol->name, sizeof(kctl.id.name));

		if (strcmp(ncontrol->name, kctl.id.name) != 0)

			snd_printk(KERN_WARNING

				   "Control name '%s' truncated to '%s'\n",

				   ncontrol->name, kctl.id.name);

	}

	kctl.id.index = ncontrol->index;

	kctl.count = ncontrol->count ? ncontrol->count : 1;

	access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :

sound/pci/ac97/ac97_codec.c

+3 −3
Original line number Diff line number Diff line
@@ -1927,7 +1927,7 @@ static int snd_ac97_dev_register(struct snd_device *device) 
	ac97->dev.bus = &ac97_bus_type;

	ac97->dev.parent = ac97->bus->card->dev;

	ac97->dev.release = ac97_device_release;

	snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",

	dev_set_name(&ac97->dev, "%d-%d:%s",

		     ac97->bus->card->number, ac97->num,

		     snd_ac97_get_short_name(ac97));

	if ((err = device_register(&ac97->dev)) < 0) {

sound/pci/hda/hda_codec.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static struct hda_vendor_id hda_vendor_ids[] = { 
	{ 0x14f1, "Conexant" },

	{ 0x17e8, "Chrontel" },

	{ 0x1854, "LG" },

	{ 0x1aec, "Wolfson Microelectronics" },

	{ 0x434d, "C-Media" },

	{ 0x8384, "SigmaTel" },

	{} /* terminator */

sound/pci/hda/hda_intel.c

+29 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/mutex.h>

#include <linux/reboot.h>

#include <sound/core.h>

#include <sound/initval.h>

#include "hda_codec.h"
@@ -397,6 +398,9 @@ struct azx { 


	/* for pending irqs */

	struct work_struct irq_pending_work;



	/* reboot notifier (for mysterious hangup problem at power-down) */

	struct notifier_block reboot_notifier;

};



/* driver types */
@@ -1978,6 +1982,28 @@ static int azx_resume(struct pci_dev *pci) 
#endif /* CONFIG_PM */





/*

 * reboot notifier for hang-up problem at power-down

 */

static int azx_halt(struct notifier_block *nb, unsigned long event, void *buf)

{

	struct azx *chip = container_of(nb, struct azx, reboot_notifier);

	azx_stop_chip(chip);

	return NOTIFY_OK;

}



static void azx_notifier_register(struct azx *chip)

{

	chip->reboot_notifier.notifier_call = azx_halt;

	register_reboot_notifier(&chip->reboot_notifier);

}



static void azx_notifier_unregister(struct azx *chip)

{

	if (chip->reboot_notifier.notifier_call)

		unregister_reboot_notifier(&chip->reboot_notifier);

}



/*

 * destructor

 */
@@ -1985,6 +2011,8 @@ static int azx_free(struct azx *chip) 
{

	int i;



	azx_notifier_unregister(chip);



	if (chip->initialized) {

		azx_clear_irq_pending(chip);

		for (i = 0; i < chip->num_streams; i++)
@@ -2348,6 +2376,7 @@ static int __devinit azx_probe(struct pci_dev *pci, 
	pci_set_drvdata(pci, card);

	chip->running = 1;

	power_down_all_codecs(chip);

	azx_notifier_register(chip);



	dev++;

	return err;