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

Commit 7943a8ab authored by Takashi Iwai's avatar Takashi Iwai
Browse files

[ALSA] hda - Avoid unexpected breakage with ALC889A hack 



The last ALC889A hack may break on some devices with certain model presets
since patch_alc*() have different model tables.  So, now it's handled in
the original patch_alc882() but fly to patch_alc883() in model=auto
appropriately.

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

sound/pci/hda/patch_realtek.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -2579,6 +2579,7 @@ static void alc_free(struct hda_codec *codec) 
		kfree(spec->kctl_alloc);

		kfree(spec->kctl_alloc);

	}

	}

	kfree(spec);

	kfree(spec);

	codec->spec = NULL; /* to be sure */

}

}





/*

/*
@@ -6336,6 +6337,8 @@ static void alc882_auto_init(struct hda_codec *codec) 
		alc_sku_automute(codec);

		alc_sku_automute(codec);

}

}





static int patch_alc883(struct hda_codec *codec); /* called in patch_alc882() */



static int patch_alc882(struct hda_codec *codec)

static int patch_alc882(struct hda_codec *codec)

{

{

	struct alc_spec *spec;

	struct alc_spec *spec;
@@ -6365,6 +6368,11 @@ static int patch_alc882(struct hda_codec *codec) 
			board_config = ALC885_MBP3;

			board_config = ALC885_MBP3;

			break;

			break;

		default:

		default:

			/* ALC889A is handled better as ALC888-compatible */

			if (codec->revision_id == 0x100103) {

				alc_free(codec);

				return patch_alc883(codec);

			}

			printk(KERN_INFO "hda_codec: Unknown model for ALC882, "

			printk(KERN_INFO "hda_codec: Unknown model for ALC882, "

		       			 "trying auto-probe from BIOS...\n");

		       			 "trying auto-probe from BIOS...\n");

			board_config = ALC882_AUTO;

			board_config = ALC882_AUTO;
@@ -14043,7 +14051,7 @@ struct hda_codec_preset snd_hda_preset_realtek[] = { 
	{ .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },

	{ .id = 0x10ec0882, .name = "ALC882", .patch = patch_alc882 },

	{ .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc883 },

	{ .id = 0x10ec0883, .name = "ALC883", .patch = patch_alc883 },

	{ .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",

	{ .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A",

	  .patch = patch_alc883 },

	  .patch = patch_alc882 }, /* should be patch_alc883() in future */

	{ .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },

	{ .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 },

	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },

	{ .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc883 },

	{ .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },

	{ .id = 0x10ec0889, .name = "ALC889", .patch = patch_alc883 },