Commit 44f167d3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus 

* fix/misc:
  ALSA: ca0106 - Fix the max capture buffer size
  ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
  ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
parents a9d90c81 34fdeb2d

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,