Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa (b4103333) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/sound/alsa/ALSA-Configuration.txt

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -837,8 +837,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

	Module for AC'97 motherboards from Intel and compatibles.		Module for AC'97 motherboards from Intel and compatibles.
	* Intel i810/810E, i815, i820, i830, i84x, MX440		* Intel i810/810E, i815, i820, i830, i84x, MX440
			ICH5, ICH6, ICH7, ESB2
	* SiS 7012 (SiS 735)		* SiS 7012 (SiS 735)
	* NVidia NForce, NForce2		* NVidia NForce, NForce2, NForce3, MCP04, CK804
			CK8, CK8S, MCP501
	* AMD AMD768, AMD8111		* AMD AMD768, AMD8111
	* ALi m5455		* ALi m5455

	@@ -868,6 +870,12 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	--------------------		--------------------

	Module for Intel ICH (i8x0) chipset MC97 modems.		Module for Intel ICH (i8x0) chipset MC97 modems.
			* Intel i810/810E, i815, i820, i830, i84x, MX440
			ICH5, ICH6, ICH7
			* SiS 7013 (SiS 735)
			* NVidia NForce, NForce2, NForce2s, NForce3
			* AMD AMD8111
			* ALi m5455

	ac97_clock - AC'97 codec clock base (0 = auto-detect)		ac97_clock - AC'97 codec clock base (0 = auto-detect)

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5206,14 +5206,14 @@ struct _snd_pcm_runtime {
	You need to pass the <function>snd_dma_pci_data(pci)</function>,		You need to pass the <function>snd_dma_pci_data(pci)</function>,
	where pci is the struct <structname>pci_dev</structname> pointer		where pci is the struct <structname>pci_dev</structname> pointer
	of the chip as well.		of the chip as well.
	The <type>snd_sg_buf_t</type> instance is created as		The <type>struct snd_sg_buf</type> instance is created as
	substream->dma_private. You can cast		substream->dma_private. You can cast
	the pointer like:		the pointer like:

	<informalexample>		<informalexample>
	<programlisting>		<programlisting>
	<![CDATA[		<![CDATA[
	struct snd_sg_buf sgbuf = (struct snd_sg_buf_t)substream->dma_private;		struct snd_sg_buf sgbuf = (struct snd_sg_buf )substream->dma_private;
	]]>		]]>
	</programlisting>		</programlisting>
	</informalexample>		</informalexample>

drivers/pnp/card.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -363,7 +363,7 @@ static int card_resume(struct pnp_dev *dev)

	int pnp_register_card_driver(struct pnp_card_driver * drv)		int pnp_register_card_driver(struct pnp_card_driver * drv)
	{		{
	int count = 0;		int count;
	struct list_head pos, temp;		struct list_head pos, temp;

	drv->link.name = drv->name;		drv->link.name = drv->name;
	@@ -374,10 +374,15 @@ int pnp_register_card_driver(struct pnp_card_driver * drv)
	drv->link.suspend = drv->suspend ? card_suspend : NULL;		drv->link.suspend = drv->suspend ? card_suspend : NULL;
	drv->link.resume = drv->resume ? card_resume : NULL;		drv->link.resume = drv->resume ? card_resume : NULL;

			count = pnp_register_driver(&drv->link);
			if (count < 0)
			return count;

	spin_lock(&pnp_lock);		spin_lock(&pnp_lock);
	list_add_tail(&drv->global_list, &pnp_card_drivers);		list_add_tail(&drv->global_list, &pnp_card_drivers);
	spin_unlock(&pnp_lock);		spin_unlock(&pnp_lock);
	pnp_register_driver(&drv->link);
			count = 0;

	list_for_each_safe(pos,temp,&pnp_cards){		list_for_each_safe(pos,temp,&pnp_cards){
	struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);		struct pnp_card *card = list_entry(pos, struct pnp_card, global_list);

sound/core/info.c

+11 −22

Original line number	Original line	Diff line number	Diff line
	@@ -444,8 +444,8 @@ static unsigned int snd_info_entry_poll(struct file file, poll_table wait)
	return mask;		return mask;
	}		}

	static inline int _snd_info_entry_ioctl(struct inode inode, struct file file,		static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
	unsigned int cmd, unsigned long arg)		unsigned long arg)
	{		{
	struct snd_info_private_data *data;		struct snd_info_private_data *data;
	struct snd_info_entry *entry;		struct snd_info_entry *entry;
	@@ -465,17 +465,6 @@ static inline int _snd_info_entry_ioctl(struct inode inode, struct file file,
	return -ENOTTY;		return -ENOTTY;
	}		}

	/* FIXME: need to unlock BKL to allow preemption */
	static int snd_info_entry_ioctl(struct inode inode, struct file file,
	unsigned int cmd, unsigned long arg)
	{
	int err;
	unlock_kernel();
	err = _snd_info_entry_ioctl(inode, file, cmd, arg);
	lock_kernel();
	return err;
	}

	static int snd_info_entry_mmap(struct file file, struct vm_area_struct vma)		static int snd_info_entry_mmap(struct file file, struct vm_area_struct vma)
	{		{
	struct inode *inode = file->f_dentry->d_inode;		struct inode *inode = file->f_dentry->d_inode;
	@@ -504,7 +493,7 @@ static struct file_operations snd_info_entry_operations =
	.read = snd_info_entry_read,		.read = snd_info_entry_read,
	.write = snd_info_entry_write,		.write = snd_info_entry_write,
	.poll = snd_info_entry_poll,		.poll = snd_info_entry_poll,
	.ioctl = snd_info_entry_ioctl,		.unlocked_ioctl = snd_info_entry_ioctl,
	.mmap = snd_info_entry_mmap,		.mmap = snd_info_entry_mmap,
	.open = snd_info_entry_open,		.open = snd_info_entry_open,
	.release = snd_info_entry_release,		.release = snd_info_entry_release,

sound/drivers/serial-u16550.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -789,7 +789,7 @@ static int __init snd_uart16550_create(struct snd_card *card,

	if ((err = snd_uart16550_detect(uart)) <= 0) {		if ((err = snd_uart16550_detect(uart)) <= 0) {
	printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);		printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);
	return err;		return -ENODEV;
	}		}

	if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {		if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {