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

Commit c2eb9c4e authored by Jaroslav Kysela's avatar Jaroslav Kysela Committed by Takashi Iwai
Browse files

ALSA: when card identification is changed, change also /proc/asound symlink 



Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9fb6198e

include/sound/info.h

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ int snd_info_card_create(struct snd_card * card); 
int snd_info_card_register(struct snd_card * card);

int snd_info_card_free(struct snd_card * card);

void snd_info_card_disconnect(struct snd_card * card);

void snd_info_card_id_change(struct snd_card * card);

int snd_info_register(struct snd_info_entry * entry);



/* for card drivers */
@@ -160,6 +161,7 @@ static inline int snd_info_card_create(struct snd_card * card) { return 0; } 
static inline int snd_info_card_register(struct snd_card * card) { return 0; }

static inline int snd_info_card_free(struct snd_card * card) { return 0; }

static inline void snd_info_card_disconnect(struct snd_card * card) { }

static inline void snd_info_card_id_change(struct snd_card * card) { }

static inline int snd_info_register(struct snd_info_entry * entry) { return 0; }



static inline int snd_card_proc_new(struct snd_card *card, const char *name,

sound/core/info.c

+17 −0
Original line number Diff line number Diff line
@@ -652,6 +652,23 @@ int snd_info_card_register(struct snd_card *card) 
	return 0;

}



/*

 * called on card->id change

 */

void snd_info_card_id_change(struct snd_card *card)

{

	mutex_lock(&info_mutex);

	if (card->proc_root_link) {

		snd_remove_proc_entry(snd_proc_root, card->proc_root_link);

		card->proc_root_link = NULL;

	}

	if (strcmp(card->id, card->proc_root->name))

		card->proc_root_link = proc_symlink(card->id,

						    snd_proc_root,

						    card->proc_root->name);

	mutex_unlock(&info_mutex);

}



/*

 * de-register the card proc file

 * called from init.c

sound/core/init.c

+1 −0
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ card_id_store_attr(struct device *dev, struct device_attribute *attr, 
			goto __exist;

	}

	strcpy(card->id, buf1);

	snd_info_card_id_change(card);

	mutex_unlock(&snd_card_mutex);



	return count;