diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2022-01-17 17:08:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-01-18 14:07:13 +0100 |
| commit | 6e4320d8ecbc8711209b3075f2d896667006fa37 (patch) | |
| tree | 7982bb82da0206391a8e42b003c6e7e87914bf11 /sound | |
| parent | ALSA: hda: cs35l41: Avoid overwriting register patch (diff) | |
| download | linux-6e4320d8ecbc8711209b3075f2d896667006fa37.tar.xz linux-6e4320d8ecbc8711209b3075f2d896667006fa37.zip | |
ALSA: hda: cs35l41: Add calls to newly added test key function
The test key now needs to be manually held when calling
cs35l41_register_errata_patch, after patch:
Add the missing function calls to this driver.
Fixes: f517ba4924ad ("ASoC: cs35l41: Add support for hibernate memory retention mode")
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-2-tanureal@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/cs35l41_hda.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index c47c5f0b4e59..509a380f9be7 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -463,6 +463,10 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i goto err; } + ret = cs35l41_test_key_unlock(cs35l41->dev, cs35l41->regmap); + if (ret) + goto err; + ret = cs35l41_register_errata_patch(cs35l41->dev, cs35l41->regmap, reg_revid); if (ret) goto err; @@ -473,6 +477,10 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i goto err; } + ret = cs35l41_test_key_lock(cs35l41->dev, cs35l41->regmap); + if (ret) + goto err; + ret = cs35l41_hda_apply_properties(cs35l41, acpi_hw_cfg); if (ret) goto err; |