Commit bca8e988 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix missing module loading with model=generic option 

When the generic codec driver is specified via model option or such,
the hda driver doesn't try to load the generic driver module but still
loads the codec-specific driver, and this ends up with the binding
failure.

This patch fixes it by moving the generic module request in the common
helper code.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=111021


Cc: <stable@vger.kernel.org> # v4.4+
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bed2e98e

sound/pci/hda/hda_bind.c

+32 −10
Original line number Diff line number Diff line
@@ -174,14 +174,40 @@ static inline bool codec_probed(struct hda_codec *codec) 
	return device_attach(hda_codec_dev(codec)) > 0 && codec->preset;

}



/* try to auto-load and bind the codec module */

static void codec_bind_module(struct hda_codec *codec)

/* try to auto-load codec module */

static void request_codec_module(struct hda_codec *codec)

{

#ifdef MODULE

	char modalias[32];

	const char *mod = NULL;



	switch (codec->probe_id) {

	case HDA_CODEC_ID_GENERIC_HDMI:

#if IS_MODULE(CONFIG_SND_HDA_CODEC_HDMI)

		mod = "snd-hda-codec-hdmi";

#endif

		break;

	case HDA_CODEC_ID_GENERIC:

#if IS_MODULE(CONFIG_SND_HDA_GENERIC)

		mod = "snd-hda-codec-generic";

#endif

		break;

	default:

		snd_hdac_codec_modalias(&codec->core, modalias, sizeof(modalias));

	request_module(modalias);

		mod = modalias;

		break;

	}



	if (mod)

		request_module(mod);

#endif /* MODULE */

}



/* try to auto-load and bind the codec module */

static void codec_bind_module(struct hda_codec *codec)

{

#ifdef MODULE

	request_codec_module(codec);

	if (codec_probed(codec))

		return;

#endif
@@ -218,17 +244,13 @@ static int codec_bind_generic(struct hda_codec *codec) 


	if (is_likely_hdmi_codec(codec)) {

		codec->probe_id = HDA_CODEC_ID_GENERIC_HDMI;

#if IS_MODULE(CONFIG_SND_HDA_CODEC_HDMI)

		request_module("snd-hda-codec-hdmi");

#endif

		request_codec_module(codec);

		if (codec_probed(codec))

			return 0;

	}



	codec->probe_id = HDA_CODEC_ID_GENERIC;

#if IS_MODULE(CONFIG_SND_HDA_GENERIC)

	request_module("snd-hda-codec-generic");

#endif

	request_codec_module(codec);

	if (codec_probed(codec))

		return 0;

	return -ENODEV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE