Commit 151b6a5f 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: pcm - Fix race with proc files
  ALSA: pcm - Fix unbalanced pm_qos_request
  ALSA: HDA: Enable internal speaker on Dell M101z
  ALSA: patch_nvhdmi.c: Fix supported sample rate list.
  sound: Remove pr_<level> uses of KERN_<level>
  ALSA: hda - Add quirk for Toshiba C650D using a Conexant CX20585
  ALSA: hda_intel: ALSA HD Audio patch for Intel Patsburg DeviceIDs
parents 509344b8 a1984f49

sound/core/pcm.c

+24 −9
Original line number Diff line number Diff line
@@ -372,14 +372,17 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry, 
						  struct snd_info_buffer *buffer)

{

	struct snd_pcm_substream *substream = entry->private_data;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_runtime *runtime;



	mutex_lock(&substream->pcm->open_mutex);

	runtime = substream->runtime;

	if (!runtime) {

		snd_iprintf(buffer, "closed\n");

		return;

		goto unlock;

	}

	if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		snd_iprintf(buffer, "no setup\n");

		return;

		goto unlock;

	}

	snd_iprintf(buffer, "access: %s\n", snd_pcm_access_name(runtime->access));

	snd_iprintf(buffer, "format: %s\n", snd_pcm_format_name(runtime->format));
@@ -398,20 +401,25 @@ static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry, 
		snd_iprintf(buffer, "OSS period frames: %lu\n", (unsigned long)runtime->oss.period_frames);

	}

#endif

 unlock:

	mutex_unlock(&substream->pcm->open_mutex);

}



static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry,

						  struct snd_info_buffer *buffer)

{

	struct snd_pcm_substream *substream = entry->private_data;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_runtime *runtime;



	mutex_lock(&substream->pcm->open_mutex);

	runtime = substream->runtime;

	if (!runtime) {

		snd_iprintf(buffer, "closed\n");

		return;

		goto unlock;

	}

	if (runtime->status->state == SNDRV_PCM_STATE_OPEN) {

		snd_iprintf(buffer, "no setup\n");

		return;

		goto unlock;

	}

	snd_iprintf(buffer, "tstamp_mode: %s\n", snd_pcm_tstamp_mode_name(runtime->tstamp_mode));

	snd_iprintf(buffer, "period_step: %u\n", runtime->period_step);
@@ -421,24 +429,29 @@ static void snd_pcm_substream_proc_sw_params_read(struct snd_info_entry *entry, 
	snd_iprintf(buffer, "silence_threshold: %lu\n", runtime->silence_threshold);

	snd_iprintf(buffer, "silence_size: %lu\n", runtime->silence_size);

	snd_iprintf(buffer, "boundary: %lu\n", runtime->boundary);

 unlock:

	mutex_unlock(&substream->pcm->open_mutex);

}



static void snd_pcm_substream_proc_status_read(struct snd_info_entry *entry,

					       struct snd_info_buffer *buffer)

{

	struct snd_pcm_substream *substream = entry->private_data;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_runtime *runtime;

	struct snd_pcm_status status;

	int err;



	mutex_lock(&substream->pcm->open_mutex);

	runtime = substream->runtime;

	if (!runtime) {

		snd_iprintf(buffer, "closed\n");

		return;

		goto unlock;

	}

	memset(&status, 0, sizeof(status));

	err = snd_pcm_status(substream, &status);

	if (err < 0) {

		snd_iprintf(buffer, "error %d\n", err);

		return;

		goto unlock;

	}

	snd_iprintf(buffer, "state: %s\n", snd_pcm_state_name(status.state));

	snd_iprintf(buffer, "owner_pid   : %d\n", pid_vnr(substream->pid));
@@ -452,6 +465,8 @@ static void snd_pcm_substream_proc_status_read(struct snd_info_entry *entry, 
	snd_iprintf(buffer, "-----\n");

	snd_iprintf(buffer, "hw_ptr      : %ld\n", runtime->status->hw_ptr);

	snd_iprintf(buffer, "appl_ptr    : %ld\n", runtime->control->appl_ptr);

 unlock:

	mutex_unlock(&substream->pcm->open_mutex);

}



#ifdef CONFIG_SND_PCM_XRUN_DEBUG

sound/core/pcm_native.c

+2 −0
Original line number Diff line number Diff line
@@ -1992,6 +1992,8 @@ void snd_pcm_release_substream(struct snd_pcm_substream *substream) 
		substream->ops->close(substream);

		substream->hw_opened = 0;

	}

	if (pm_qos_request_active(&substream->latency_pm_qos_req))

		pm_qos_remove_request(&substream->latency_pm_qos_req);

	if (substream->pcm_release) {

		substream->pcm_release(substream);

		substream->pcm_release = NULL;

sound/pci/hda/hda_intel.c

+3 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ MODULE_SUPPORTED_DEVICE("{{Intel, ICH6}," 
			 "{Intel, ICH10},"

			 "{Intel, PCH},"

			 "{Intel, CPT},"

			 "{Intel, PBG},"

			 "{Intel, SCH},"

			 "{ATI, SB450},"

			 "{ATI, SB600},"
@@ -2749,6 +2750,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	{ PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },

	/* CPT */

	{ PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },

	/* PBG */

	{ PCI_DEVICE(0x8086, 0x1d20), .driver_data = AZX_DRIVER_PCH },

	/* SCH */

	{ PCI_DEVICE(0x8086, 0x811b), .driver_data = AZX_DRIVER_SCH },

	/* ATI SB 450/600 */

sound/pci/hda/patch_conexant.c

+1 −0
Original line number Diff line number Diff line
@@ -3092,6 +3092,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO),

	SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),

	SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD),

	SND_PCI_QUIRK(0x1179, 0xff50, "Toshiba Satellite P500-PSPGSC-01800T", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5),

	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),

sound/pci/hda/patch_nvhdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static struct hda_verb nvhdmi_basic_init_7x[] = { 
#else

/* support all rates and formats */

#define SUPPORTED_RATES \

	(SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\

	(SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\

	SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 |\

	 SNDRV_PCM_RATE_192000)

#define SUPPORTED_MAXBPS	24

CRA Git | Maintained and supported by SUSTech CRA and CCSE