Skip to content

Commit 0d4b3cd

Browse files
Stefan Bindingsmb49
authored andcommitted
ALSA: hda: cs35l41: Add device_link between HDA and cs35l41_hda
BugLink: https://bugs.launchpad.net/bugs/2029199 To ensure consistency between the HDA core and the CS35L41 HDA driver, add a device_link between them. This ensures that the HDA core will suspend first, and resume second, meaning the amp driver will not miss any events from the playback hook from the HDA core during system suspend and resume. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Link: https://lore.kernel.org/r/20230721151816.2080453-11-sbinding@opensource.cirrus.com Signed-off-by: Takashi Iwai <tiwai@suse.de> (cherry picked from commit 7cf5ce66dfda2be444ea668c3d48f732ba4a7fd1 linux-next) Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
1 parent ffbefd0 commit 0d4b3cd

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

sound/pci/hda/cs35l41_hda.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,7 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
10671067
{
10681068
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
10691069
struct hda_component *comps = master_data;
1070+
unsigned int sleep_flags;
10701071
int ret = 0;
10711072

10721073
if (!comps || cs35l41->index < 0 || cs35l41->index >= HDA_MAX_COMPONENTS)
@@ -1106,6 +1107,11 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
11061107

11071108
mutex_unlock(&cs35l41->fw_mutex);
11081109

1110+
sleep_flags = lock_system_sleep();
1111+
if (!device_link_add(&comps->codec->core.dev, cs35l41->dev, DL_FLAG_STATELESS))
1112+
dev_warn(dev, "Unable to create device link\n");
1113+
unlock_system_sleep(sleep_flags);
1114+
11091115
pm_runtime_mark_last_busy(dev);
11101116
pm_runtime_put_autosuspend(dev);
11111117

@@ -1116,9 +1122,14 @@ static void cs35l41_hda_unbind(struct device *dev, struct device *master, void *
11161122
{
11171123
struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
11181124
struct hda_component *comps = master_data;
1125+
unsigned int sleep_flags;
11191126

1120-
if (comps[cs35l41->index].dev == dev)
1127+
if (comps[cs35l41->index].dev == dev) {
11211128
memset(&comps[cs35l41->index], 0, sizeof(*comps));
1129+
sleep_flags = lock_system_sleep();
1130+
device_link_remove(&comps->codec->core.dev, cs35l41->dev);
1131+
unlock_system_sleep(sleep_flags);
1132+
}
11221133
}
11231134

11241135
static const struct component_ops cs35l41_hda_comp_ops = {

0 commit comments

Comments
 (0)