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

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

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

Pull sound fixes from Takashi Iwai:
 "Except for a slightly big OMAP changes, all rest are small, mostly
  boring changes; all either 3.11 regression fixes or stable materials.

   - ASoC OMAP fixes due to non-DT OMAP4 removals
   - Other ASoC driver changes (sglt5000, wm8978, wm8948, samsung)
   - Fix missing locking for snd_pcm_stop() calls in many drivers
   - Fix the blocking request_module() in OSS sequencer
   - Fix old OSS vwsnd driver builds
   - Add a new HD-audio HDMI codec ID"

* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
  ALSA: seq-oss: Initialize MIDI clients asynchronously
  ALSA: hda - Add new GPU codec ID to snd-hda
  staging: line6: Fix unlocked snd_pcm_stop() call
  [media] saa7134: Fix unlocked snd_pcm_stop() call
  ASoC: s6000: Fix unlocked snd_pcm_stop() call
  ASoC: atmel: Fix unlocked snd_pcm_stop() call
  ALSA: pxa2xx: Fix unlocked snd_pcm_stop() call
  ALSA: usx2y: Fix unlocked snd_pcm_stop() call
  ALSA: ua101: Fix unlocked snd_pcm_stop() call
  ALSA: 6fire: Fix unlocked snd_pcm_stop() call
  ALSA: atiixp: Fix unlocked snd_pcm_stop() call
  ALSA: asihpi: Fix unlocked snd_pcm_stop() call
  sound: oss/vwsnd: Always define vwsnd_mutex
  sound: oss/vwsnd: Add missing inclusion of linux/delay.h
  ASoC: wm8978: enable symmetric rates
  ASoC: omap-mcbsp: Use different method for DMA request when booted with DT
  ASoC: omap-dmic: Do not use platform_get_resource_byname() for DMA
  ASoC: omap-mcpdm: Do not use platform_get_resource_byname() for DMA
  ASoC: omap-pcm: Request the DMA channel differently when DT is involved
  ASoC: Samsung: Set RFS and BFS in slave mode
  ...
parents 61f98b0f 256ca9c3

drivers/media/pci/saa7134/saa7134-alsa.c

+2 −0
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, 
		dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count,

			dev->dmasound.bufsize, dev->dmasound.blocks);

		spin_unlock(&dev->slock);

		snd_pcm_stream_lock(dev->dmasound.substream);

		snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(dev->dmasound.substream);

		return;

	}

drivers/staging/line6/pcm.c

+4 −1
Original line number Diff line number Diff line
@@ -392,8 +392,11 @@ static int snd_line6_pcm_free(struct snd_device *device) 
*/

static void pcm_disconnect_substream(struct snd_pcm_substream *substream)

{

	if (substream->runtime && snd_pcm_running(substream))

	if (substream->runtime && snd_pcm_running(substream)) {

		snd_pcm_stream_lock_irq(substream);

		snd_pcm_stop(substream, SNDRV_PCM_STATE_DISCONNECTED);

		snd_pcm_stream_unlock_irq(substream);

	}

}



/*

sound/arm/pxa2xx-pcm-lib.c

+2 −0
Original line number Diff line number Diff line
@@ -166,7 +166,9 @@ void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id) 
	} else {

		printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",

			rtd->params->name, dma_ch, dcsr);

		snd_pcm_stream_lock(substream);

		snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);

		snd_pcm_stream_unlock(substream);

	}

}

EXPORT_SYMBOL(pxa2xx_pcm_dma_irq);

sound/core/seq/oss/seq_oss_init.c

+13 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/export.h>

#include <linux/moduleparam.h>

#include <linux/slab.h>

#include <linux/workqueue.h>



/*

 * common variables
@@ -60,6 +61,14 @@ static void free_devinfo(void *private); 
#define call_ctl(type,rec) snd_seq_kernel_client_ctl(system_client, type, rec)





/* call snd_seq_oss_midi_lookup_ports() asynchronously */

static void async_call_lookup_ports(struct work_struct *work)

{

	snd_seq_oss_midi_lookup_ports(system_client);

}



static DECLARE_WORK(async_lookup_work, async_call_lookup_ports);



/*

 * create sequencer client for OSS sequencer

 */
@@ -85,9 +94,6 @@ snd_seq_oss_create_client(void) 
	system_client = rc;

	debug_printk(("new client = %d\n", rc));



	/* look up midi devices */

	snd_seq_oss_midi_lookup_ports(system_client);



	/* create annoucement receiver port */

	memset(port, 0, sizeof(*port));

	strcpy(port->name, "Receiver");
@@ -115,6 +121,9 @@ snd_seq_oss_create_client(void) 
	}

	rc = 0;



	/* look up midi devices */

	schedule_work(&async_lookup_work);



 __error:

	kfree(port);

	return rc;
@@ -160,6 +169,7 @@ receive_announce(struct snd_seq_event *ev, int direct, void *private, int atomic 
int

snd_seq_oss_delete_client(void)

{

	cancel_work_sync(&async_lookup_work);

	if (system_client >= 0)

		snd_seq_delete_kernel_client(system_client);

sound/core/seq/oss/seq_oss_midi.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int send_midi_event(struct seq_oss_devinfo *dp, struct snd_seq_event *ev, 
 * look up the existing ports

 * this looks a very exhausting job.

 */

int __init

int

snd_seq_oss_midi_lookup_ports(int client)

{

	struct snd_seq_client_info *clinfo;