Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa (b6a10886) · Commits · 戴 / test

include/sound/version.h

+1 −1

Original line number	Diff line number	Diff line
		/* include/version.h. Generated by alsa/ksync script. */
		#define CONFIG_SND_VERSION "1.0.13"
		#define CONFIG_SND_DATE " (Sun Oct 22 08:56:16 2006 UTC)"
		#define CONFIG_SND_DATE " (Tue Nov 28 14:07:24 2006 UTC)"

sound/aoa/codecs/snd-aoa-codec-tas.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -514,9 +514,15 @@ static int tas_snd_capture_source_put(struct snd_kcontrol *kcontrol,
		mutex_lock(&tas->mtx);
		oldacr = tas->acr;

		tas->acr &= ~TAS_ACR_INPUT_B;
		/*
		* Despite what the data sheet says in one place, the
		* TAS_ACR_B_MONAUREAL bit forces mono output even when
		* input A (line in) is selected.
		*/
		tas->acr &= ~(TAS_ACR_INPUT_B \| TAS_ACR_B_MONAUREAL);
		if (ucontrol->value.enumerated.item[0])
		tas->acr \|= TAS_ACR_INPUT_B;
		tas->acr \|= TAS_ACR_INPUT_B \| TAS_ACR_B_MONAUREAL \|
		TAS_ACR_B_MON_SEL_RIGHT;
		if (oldacr == tas->acr) {
		mutex_unlock(&tas->mtx);
		return 0;
		@@ -686,8 +692,7 @@ static int tas_reset_init(struct tas *tas)
		if (tas_write_reg(tas, TAS_REG_MCS, 1, &tmp))
		goto outerr;

		tas->acr \|= TAS_ACR_ANALOG_PDOWN \| TAS_ACR_B_MONAUREAL \|
		TAS_ACR_B_MON_SEL_RIGHT;
		tas->acr \|= TAS_ACR_ANALOG_PDOWN;
		if (tas_write_reg(tas, TAS_REG_ACR, 1, &tas->acr))
		goto outerr;

sound/core/oss/pcm_oss.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2359,6 +2359,7 @@ static int snd_pcm_oss_release(struct inode inode, struct file file)
		substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_CAPTURE];
		snd_assert(substream != NULL, return -ENXIO);
		pcm = substream->pcm;
		if (!pcm->card->shutdown)
		snd_pcm_oss_sync(pcm_oss_file);
		mutex_lock(&pcm->open_mutex);
		snd_pcm_oss_release_file(pcm_oss_file);

sound/core/pcm_native.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1310,7 +1310,8 @@ static int snd_pcm_pre_prepare(struct snd_pcm_substream *substream,
		int f_flags)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
		if (runtime->status->state == SNDRV_PCM_STATE_OPEN \|\|
		runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED)
		return -EBADFD;
		if (snd_pcm_running(substream))
		return -EBUSY;
		@@ -1568,7 +1569,8 @@ static int snd_pcm_drop(struct snd_pcm_substream *substream)
		runtime = substream->runtime;
		card = substream->pcm->card;

		if (runtime->status->state == SNDRV_PCM_STATE_OPEN)
		if (runtime->status->state == SNDRV_PCM_STATE_OPEN \|\|
		runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED)
		return -EBADFD;

		snd_power_lock(card);

sound/core/rtctimer.c

+14 −6

Original line number	Diff line number	Diff line
		@@ -22,13 +22,10 @@

		#include <sound/driver.h>
		#include <linux/init.h>
		#include <linux/time.h>
		#include <linux/threads.h>
		#include <linux/interrupt.h>
		#include <linux/moduleparam.h>
		#include <sound/core.h>
		#include <sound/timer.h>
		#include <sound/info.h>

		#if defined(CONFIG_RTC) \|\| defined(CONFIG_RTC_MODULE)

		@@ -50,7 +47,9 @@ static int rtctimer_stop(struct snd_timer *t);
		* The hardware dependent description for this timer.
		*/
		static struct snd_timer_hardware rtc_hw = {
		.flags = SNDRV_TIMER_HW_FIRST\|SNDRV_TIMER_HW_AUTO,
		.flags = SNDRV_TIMER_HW_AUTO \|
		SNDRV_TIMER_HW_FIRST \|
		SNDRV_TIMER_HW_TASKLET,
		.ticks = 100000000L, /* FIXME: XXX */
		.open = rtctimer_open,
		.close = rtctimer_close,
		@@ -60,6 +59,7 @@ static struct snd_timer_hardware rtc_hw = {

		static int rtctimer_freq = RTC_FREQ; /* frequency */
		static struct snd_timer *rtctimer;
		static struct tasklet_struct rtc_tasklet;
		static rtc_task_t rtc_task;


		@@ -81,6 +81,7 @@ rtctimer_close(struct snd_timer *t)
		rtc_task_t *rtc = t->private_data;
		if (rtc) {
		rtc_unregister(rtc);
		tasklet_kill(&rtc_tasklet);
		t->private_data = NULL;
		}
		return 0;
		@@ -105,12 +106,17 @@ rtctimer_stop(struct snd_timer *timer)
		return 0;
		}

		static void rtctimer_tasklet(unsigned long data)
		{
		snd_timer_interrupt((struct snd_timer *)data, 1);
		}

		/*
		* interrupt
		*/
		static void rtctimer_interrupt(void *private_data)
		{
		snd_timer_interrupt(private_data, 1);
		tasklet_hi_schedule(private_data);
		}


		@@ -139,9 +145,11 @@ static int __init rtctimer_init(void)
		timer->hw = rtc_hw;
		timer->hw.resolution = NANO_SEC / rtctimer_freq;

		tasklet_init(&rtc_tasklet, rtctimer_tasklet, (unsigned long)timer);

		/* set up RTC callback */
		rtc_task.func = rtctimer_interrupt;
		rtc_task.private_data = timer;
		rtc_task.private_data = &rtc_tasklet;

		err = snd_timer_global_register(timer);
		if (err < 0) {

Admin message