[alsa-devel] proc_dir_entry 'asound/pcm' already registered

[Takashi Iwai]

On Thu, 24 Aug 2017 19:28:12 +0200,
Fabio Estevam wrote:
> 
> Hi,
> 
> I am running linux-next 20170824 on a imx6q-sabresd and getting the
> warnings below.
> 
> Any ideas as to why 'asound/pcm' is getting registered twice?

Gah, this is a careless conversion failure that slipped in the recent
trivial cleanup patch.  The fix is attached below.

Markus, please please be careful at the next time.  If a similar
failure happens again, I'm not going to take such patches any longer!


thanks,

Takashi

-- 8< --
From: Takashi Iwai <tiwai at suse.de>
Subject: [PATCH] ALSA: pcm: Correct broken procfs set up

The commit c8da9be4a75f ("ALSA: pcm: Adjust nine function calls
together with a variable assignment") contained a badly incorrect
conversion, a "status" PCM procfs creation was replaced with the next
one.  Luckily, this could be spotted easily by the kernel runtime
warning.

Fixes: c8da9be4a75f ("ALSA: pcm: Adjust nine function calls together...")
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/core/pcm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index c790f79e45ae..7eadb7fd8074 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -625,7 +625,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
 		}
 	}
 	substream->proc_sw_params_entry = entry;
-	entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL);
+	entry = snd_info_create_card_entry(card, "status",
+					   substream->proc_root);
 	if (entry) {
 		snd_info_set_text_ops(entry, substream,
 				      snd_pcm_substream_proc_status_read);
-- 
2.14.0