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

Commit 09cefbb6 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: (26 commits)
  ASoC: Fix power down for widgetless per-card DAPM context case
  ASoC: wm1250-ev1: Define "WM1250 Output" with SND_SOC_DAPM_OUTPUT
  ASoC: Remove duplicate linux/delay.h inclusion.
  ASoC: sam9g20_wm8731: use the proper SYSCKL value
  ASoC: wm8731: fix wm8731_check_osc() connected condition
  ALSA: hda - Reorganize controller quriks with bit flags
  ALSA: hda - Use snd_printd() in snd_hda_parse_pin_def_config()
  ALSA: core: remove unused variables.
  ALSA: HDA: Increase MAX_HDMI_PINS
  ALSA: PCM - Don't check DMA time-out too shortly
  MAINTAINERS: add FireWire audio maintainer
  ALSA: usb-audio: more control quirks for M-Audio FastTrack devices
  ALSA: usb-audio: add new quirk type QUIRK_AUDIO_STANDARD_MIXER
  ALSA: usb-audio: export snd_usb_feature_unit_ctl
  ALSA: usb-audio: rework add_control_to_empty()
  ALSA: usb-audio: move assignment of chip->ctrl_intf
  ALSA: hda - Use model=auto for Lenovo G555
  ALSA: HDA: Unify HDMI hotplug handling.
  ALSA: hda - Force AD1988_6STACK_DIG for Asus M3N-HT Deluxe
  ASoC: core - remove superfluous new line.
  ...
parents dc7acbb2 cf73df1e

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2584,6 +2584,13 @@ S: Maintained 
F:	drivers/hwmon/f75375s.c

F:	include/linux/f75375s.h



FIREWIRE AUDIO DRIVERS

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	sound/firewire/



FIREWIRE SUBSYSTEM

M:	Stefan Richter <stefanr@s5r6.in-berlin.de>

L:	linux1394-devel@lists.sourceforge.net

sound/core/control.c

+1 −2
Original line number Diff line number Diff line
@@ -704,13 +704,12 @@ static int snd_ctl_elem_list(struct snd_card *card, 
	struct snd_ctl_elem_list list;

	struct snd_kcontrol *kctl;

	struct snd_ctl_elem_id *dst, *id;

	unsigned int offset, space, first, jidx;

	unsigned int offset, space, jidx;

	

	if (copy_from_user(&list, _list, sizeof(list)))

		return -EFAULT;

	offset = list.offset;

	space = list.space;

	first = 0;

	/* try limit maximum space */

	if (space > 16384)

		return -ENOMEM;

sound/core/init.c

+0 −3
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ static const struct file_operations snd_shutdown_f_ops = 
int snd_card_disconnect(struct snd_card *card)

{

	struct snd_monitor_file *mfile;

	struct file *file;

	int err;



	if (!card)
@@ -366,8 +365,6 @@ int snd_card_disconnect(struct snd_card *card) 
	

	spin_lock(&card->files_lock);

	list_for_each_entry(mfile, &card->files_list, list) {

		file = mfile->file;



		/* it's critical part, use endless loop */

		/* we have no room to fail */

		mfile->disconnected_f_op = mfile->file->f_op;

sound/core/oss/linear.c

+0 −3
Original line number Diff line number Diff line
@@ -90,11 +90,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin, 
			       struct snd_pcm_plugin_channel *dst_channels,

			       snd_pcm_uframes_t frames)

{

	struct linear_priv *data;



	if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))

		return -ENXIO;

	data = (struct linear_priv *)plugin->extra_data;

	if (frames == 0)

		return 0;

#ifdef CONFIG_SND_DEBUG

sound/core/pcm_lib.c

+13 −4
Original line number Diff line number Diff line
@@ -1756,8 +1756,18 @@ static int wait_for_avail(struct snd_pcm_substream *substream, 
	wait_queue_t wait;

	int err = 0;

	snd_pcm_uframes_t avail = 0;

	long tout;

	long wait_time, tout;



	if (runtime->no_period_wakeup)

		wait_time = MAX_SCHEDULE_TIMEOUT;

	else {

		wait_time = 10;

		if (runtime->rate) {

			long t = runtime->period_size * 2 / runtime->rate;

			wait_time = max(t, wait_time);

		}

		wait_time = msecs_to_jiffies(wait_time * 1000);

	}

	init_waitqueue_entry(&wait, current);

	add_wait_queue(&runtime->tsleep, &wait);

	for (;;) {
@@ -1765,9 +1775,8 @@ static int wait_for_avail(struct snd_pcm_substream *substream, 
			err = -ERESTARTSYS;

			break;

		}

		set_current_state(TASK_INTERRUPTIBLE);

		snd_pcm_stream_unlock_irq(substream);

		tout = schedule_timeout(msecs_to_jiffies(10000));

		tout = schedule_timeout_interruptible(wait_time);

		snd_pcm_stream_lock_irq(substream);

		switch (runtime->status->state) {

		case SNDRV_PCM_STATE_SUSPENDED: