Commit 155dbfd8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge commit master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa of HEAD 

* HEAD:
  [ALSA] Fix undefined (missing) references in ISA MIRO sound driver
  [ALSA] make sound/isa/gus/gusextreme.c:devices static
  [ALSA] hda-codec - Fix missing array terminators in AD1988 codec support
  [ALSA] Fix a deadlock in snd-rtctimer
  [ALSA] Fix section mismatch errors in ALSA PCI drivers
  [ALSA] remove unused snd_minor.name field
  [ALSA] Fix no mpu401 interface can cause hard freeze
  [ALSA] wavefront: fix __init/__devinit confusion
  [ALSA] Fix workaround for AD1988A rev2 codec
  [ALSA] trivial: Code clean up of i2c/cs8427.c
  [ALSA] sound/i2c/cs8427.c: don't export a static function
  [ALSA] intel8x0 - Add ac97 quirk for Tyan Thunder K8WE board
  [ALSA] Reduce the string length of Terratec Aureon 7.1 Universe
  [ALSA] sound/pci/Kconfig - fix broken indenting for SND_FM801_TEA575X
  [ALSA] fix the SND_FM801_TEA575X dependencies
  [ALSA] Memory leak in sound/pcmcia/pdaudiocf/pdaudiocf.c
parents 15e0c694 d2a5b9d4

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ 
  }        



  /* PCI IDs */

  static struct pci_device_id snd_mychip_ids[] __devinitdata = {

  static struct pci_device_id snd_mychip_ids[] = {

          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,

            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

          ....
@@ -1565,7 +1565,7 @@ 
        <informalexample>

          <programlisting>

<![CDATA[

  static struct pci_device_id snd_mychip_ids[] __devinitdata = {

  static struct pci_device_id snd_mychip_ids[] = {

          { PCI_VENDOR_ID_FOO, PCI_DEVICE_ID_BAR,

            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },

          ....

include/sound/core.h

+0 −2
Original line number Diff line number Diff line
@@ -188,8 +188,6 @@ struct snd_minor { 
	int device;			/* device number */

	const struct file_operations *f_ops;	/* file operations */

	void *private_data;		/* private data for f_ops->open */

	char name[0];			/* device name (keep at the end of

								structure) */

};



/* sound.c */

include/sound/cs46xx.h

+1 −0
Original line number Diff line number Diff line
@@ -1704,6 +1704,7 @@ struct snd_cs46xx { 
	int acpi_port;

	struct snd_kcontrol *eapd_switch; /* for amplifier hack */

	int accept_valid;	/* accept mmap valid (for OSS) */

	int in_suspend;



	struct gameport *gameport;

sound/core/sound.c

+1 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ int snd_register_device(int type, struct snd_card *card, int dev, 
	struct device *device = NULL;



	snd_assert(name, return -EINVAL);

	preg = kmalloc(sizeof(struct snd_minor) + strlen(name) + 1, GFP_KERNEL);

	preg = kmalloc(sizeof *preg, GFP_KERNEL);

	if (preg == NULL)

		return -ENOMEM;

	preg->type = type;
@@ -252,7 +252,6 @@ int snd_register_device(int type, struct snd_card *card, int dev, 
	preg->device = dev;

	preg->f_ops = f_ops;

	preg->private_data = private_data;

	strcpy(preg->name, name);

	mutex_lock(&sound_mutex);

#ifdef CONFIG_SND_DYNAMIC_MINORS

	minor = snd_find_free_minor();

sound/core/timer.c

+3 −2
Original line number Diff line number Diff line
@@ -628,8 +628,9 @@ static void snd_timer_tasklet(unsigned long arg) 
	struct snd_timer_instance *ti;

	struct list_head *p;

	unsigned long resolution, ticks;

	unsigned long flags;



	spin_lock(&timer->lock);

	spin_lock_irqsave(&timer->lock, flags);

	/* now process all callbacks */

	while (!list_empty(&timer->sack_list_head)) {

		p = timer->sack_list_head.next;		/* get first item */
@@ -649,7 +650,7 @@ static void snd_timer_tasklet(unsigned long arg) 
		spin_lock(&timer->lock);

		ti->flags &= ~SNDRV_TIMER_IFLG_CALLBACK;

	}

	spin_unlock(&timer->lock);

	spin_unlock_irqrestore(&timer->lock, flags);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE