diff mbox series

[2/5] ALSA: hda: cs35l41: Add calls to newly added test key function

Message ID 20220113170728.1953559-2-tanureal@opensource.cirrus.com (mailing list archive)
State Superseded
Headers show
Series [1/5] ALSA: hda: cs35l41: Avoid overwriting register patch | expand

Commit Message

Lucas Tanure Jan. 13, 2022, 5:07 p.m. UTC
From: Charles Keepax <ckeepax@opensource.cirrus.com>

The test key now needs to be manually held when calling
cs35l41_register_errata_patch, after patch:

'commit f517ba4924ad ("ASoC: cs35l41: Add support for
hibernate memory retention mode")'

Add the missing function calls to this driver.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
---
 sound/pci/hda/cs35l41_hda.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Cezary Rojewski Jan. 14, 2022, 4:14 p.m. UTC | #1
On 2022-01-13 6:07 PM, Lucas Tanure wrote:
> From: Charles Keepax <ckeepax@opensource.cirrus.com>
> 
> The test key now needs to be manually held when calling
> cs35l41_register_errata_patch, after patch:
> 
> 'commit f517ba4924ad ("ASoC: cs35l41: Add support for
> hibernate memory retention mode")'
> 
> Add the missing function calls to this driver.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>

Judging by the commit's message, this patch is a fix for a previously 
added commit so appropriate 'Fixes' tag could prove helpful here.

>   sound/pci/hda/cs35l41_hda.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> 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;
>
diff mbox series

Patch

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;