Commit 8372d498 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ctxfi - Fix PCM device naming 



PCM names for surround streams should be also fixed as well as the mixer
element names.  Also, a bit clean up for PCM name setup.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6585db94

sound/pci/ctxfi/ctatc.c

+4 −4
Original line number Diff line number Diff line
@@ -72,15 +72,15 @@ static struct { 
	[FRONT]		= { .create = ct_alsa_pcm_create,

			    .destroy = NULL,

			    .public_name = "Front/WaveIn"},

	[REAR]		= { .create = ct_alsa_pcm_create,

	[SURROUND]	= { .create = ct_alsa_pcm_create,

			    .destroy = NULL,

			    .public_name = "Rear"},

			    .public_name = "Surround"},

	[CLFE]		= { .create = ct_alsa_pcm_create,

			    .destroy = NULL,

			    .public_name = "Center/LFE"},

	[SURROUND]	= { .create = ct_alsa_pcm_create,

	[SIDE]		= { .create = ct_alsa_pcm_create,

			    .destroy = NULL,

			    .public_name = "Surround"},

			    .public_name = "Side"},

	[IEC958]	= { .create = ct_alsa_pcm_create,

			    .destroy = NULL,

			    .public_name = "IEC958 Non-audio"},

sound/pci/ctxfi/ctatc.h

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 


enum CTALSADEVS {		/* Types of alsa devices */

	FRONT,

	REAR,

	CLFE,

	SURROUND,

	CLFE,

	SIDE,

	IEC958,

	MIXER,

	NUM_CTALSADEVS		/* This should always be the last */

sound/pci/ctxfi/ctpcm.c

+2 −4
Original line number Diff line number Diff line
@@ -469,12 +469,10 @@ int ct_alsa_pcm_create(struct ct_atc *atc, 
	struct snd_pcm *pcm;

	int err;

	int playback_count, capture_count;

	char name[128];



	strncpy(name, device_name, sizeof(name));

	playback_count = (IEC958 == device) ? 1 : 8;

	capture_count = (FRONT == device) ? 1 : 0;

	err = snd_pcm_new(atc->card, name, device,

	err = snd_pcm_new(atc->card, "ctxfi", device,

			  playback_count, capture_count, &pcm);

	if (err < 0) {

		printk(KERN_ERR "ctxfi: snd_pcm_new failed!! Err=%d\n", err);
@@ -484,7 +482,7 @@ int ct_alsa_pcm_create(struct ct_atc *atc, 
	pcm->private_data = atc;

	pcm->info_flags = 0;

	pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;

	strcpy(pcm->name, device_name);

	strlcpy(pcm->name, device_name, sizeof(pcm->name));



	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ct_pcm_playback_ops);