]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ALSA: hda: cs35l41: Avoid overwriting register patch
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Mon, 17 Jan 2022 16:08:25 +0000 (16:08 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:41:38 +0000 (14:41 +0200)
BugLink: https://bugs.launchpad.net/bugs/1965496
regmap_register_patch can't be used to apply the probe sequence as a
patch is already registers with the regmap by
cs35l41_register_errata_patch and only a single patch can be attached to
a single regmap. The driver doesn't currently rely on a cache sync to
re-apply this probe sequence so simply switch it to a multi write.

Fixes: 7b2f3eb492da ("ALSA: hda: cs35l41: Add support for CS35L41 in HDA systems")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220117160830.709403-1-tanureal@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit 2cb52046d186863e16ac82850c0e225462e493f1)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Acked-by: Andrea Righi <andrea.righi@canonical.com>
Acked-by: Paolo Pisati <paolo.pisati@canonical.com>
sound/pci/hda/cs35l41_hda.c

index 30b40d865863f0a3c2b54079d70df8e5f38317df..c47c5f0b4e59ce965adf01fe030ae9ac494b9d31 100644 (file)
@@ -480,7 +480,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i
        acpi_hw_cfg = NULL;
 
        if (cs35l41->reg_seq->probe) {
-               ret = regmap_register_patch(cs35l41->regmap, cs35l41->reg_seq->probe,
+               ret = regmap_multi_reg_write(cs35l41->regmap, cs35l41->reg_seq->probe,
                                            cs35l41->reg_seq->num_probe);
                if (ret) {
                        dev_err(cs35l41->dev, "Fail to apply probe reg patch: %d\n", ret);