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

Commit 0d517fb1 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: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
  ALSA: ca0106 - Fix the max capture buffer size
  ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
  ALSA: hda - Add quirk for Gateway T6834c laptop
  ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
  ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
  ALSA: hda_codec: Check for invalid zero connections
parents 1fd1f285 44f167d3

sound/core/seq/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ 
# Copyright (c) 1999 by Jaroslav Kysela <perex@perex.cz>

#



ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)

  obj-$(CONFIG_SND_SEQUENCER) += oss/

endif



snd-seq-device-objs := seq_device.o

snd-seq-objs := seq.o seq_lock.o seq_clientmgr.o seq_memory.o seq_queue.o \

                seq_fifo.o seq_prioq.o seq_timer.o \
@@ -20,6 +16,7 @@ snd-seq-virmidi-objs := seq_virmidi.o 
obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o

ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)

  obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o

  obj-$(CONFIG_SND_SEQUENCER) += oss/

endif

obj-$(CONFIG_SND_SEQ_DUMMY) += snd-seq-dummy.o

sound/isa/gus/gus_pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -795,13 +795,13 @@ static int snd_gf1_pcm_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_ 
		if (!(pcmp->flags & SNDRV_GF1_PCM_PFLG_ACTIVE))

			continue;

		/* load real volume - better precision */

		spin_lock_irqsave(&gus->reg_lock, flags);

		spin_lock(&gus->reg_lock);

		snd_gf1_select_voice(gus, pvoice->number);

		snd_gf1_ctrl_stop(gus, SNDRV_GF1_VB_VOLUME_CONTROL);

		vol = pvoice == pcmp->pvoices[0] ? gus->gf1.pcm_volume_level_left : gus->gf1.pcm_volume_level_right;

		snd_gf1_write16(gus, SNDRV_GF1_VW_VOLUME, vol);

		pcmp->final_volume = 1;

		spin_unlock_irqrestore(&gus->reg_lock, flags);

		spin_unlock(&gus->reg_lock);

	}

	spin_unlock_irqrestore(&gus->voice_alloc, flags);

	return change;

sound/pci/ca0106/ca0106_main.c

+2 −2
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ static struct snd_pcm_hardware snd_ca0106_capture_hw = { 
	.rate_max =		192000,

	.channels_min =		2,

	.channels_max =		2,

	.buffer_bytes_max =	((65536 - 64) * 8),

	.buffer_bytes_max =	65536 - 128,

	.period_bytes_min =	64,

	.period_bytes_max =	(65536 - 64),

	.period_bytes_max =	32768 - 64,

	.periods_min =		2,

	.periods_max =		2,

	.fifo_size =		0,

sound/pci/ctxfi/ctdaio.c

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ struct daio_rsc_idx idx_20k1[NUM_DAIOTYP] = { 


struct daio_rsc_idx idx_20k2[NUM_DAIOTYP] = {

	[LINEO1] = {.left = 0x40, .right = 0x41},

	[LINEO2] = {.left = 0x70, .right = 0x71},

	[LINEO2] = {.left = 0x60, .right = 0x61},

	[LINEO3] = {.left = 0x50, .right = 0x51},

	[LINEO4] = {.left = 0x60, .right = 0x61},

	[LINEO4] = {.left = 0x70, .right = 0x71},

	[LINEIM] = {.left = 0x45, .right = 0xc5},

	[SPDIFOO] = {.left = 0x00, .right = 0x01},

	[SPDIFIO] = {.left = 0x05, .right = 0x85},

sound/pci/hda/hda_codec.c

+6 −0
Original line number Diff line number Diff line
@@ -332,6 +332,12 @@ int snd_hda_get_connections(struct hda_codec *codec, hda_nid_t nid, 
						  AC_VERB_GET_CONNECT_LIST, i);

		range_val = !!(parm & (1 << (shift-1))); /* ranges */

		val = parm & mask;

		if (val == 0) {

			snd_printk(KERN_WARNING "hda_codec: "

				   "invalid CONNECT_LIST verb %x[%i]:%x\n",

				    nid, i, parm);

			return 0;

		}

		parm >>= shift;

		if (range_val) {

			/* ranges between the previous and this one */