Skip to content

Commit 6a451e2

Browse files
jimxbj-dottiwai
authored andcommitted
ALSA: hda/tas2781: Ignore SUBSYS_ID not found for tas2563 projects
Driver will return error if no SUBSYS_ID found in BIOS(acpi). It will cause error in tas2563 projects, which have no SUBSYS_ID. Fixes: 4e7035a ("ALSA: hda/tas2781: Add speaker id check for ASUS projects") Signed-off-by: Baojun Xu <baojun.xu@ti.com> Link: https://lore.kernel.org/20241223225442.1358491-1-stuart.a.hayhurst@gmail.com Link: https://patch.msgid.link/20241230064910.1583-1-baojun.xu@ti.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent b06a618 commit 6a451e2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

sound/pci/hda/tas2781_hda_i2c.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid)
142142
}
143143
sub = acpi_get_subsystem_id(ACPI_HANDLE(physdev));
144144
if (IS_ERR(sub)) {
145+
/* No subsys id in older tas2563 projects. */
146+
if (!strncmp(hid, "INT8866", sizeof("INT8866")))
147+
goto end_2563;
145148
dev_err(p->dev, "Failed to get SUBSYS ID.\n");
146149
ret = PTR_ERR(sub);
147150
goto err;
@@ -164,6 +167,7 @@ static int tas2781_read_acpi(struct tasdevice_priv *p, const char *hid)
164167
p->speaker_id = NULL;
165168
}
166169

170+
end_2563:
167171
acpi_dev_free_resource_list(&resources);
168172
strscpy(p->dev_name, hid, sizeof(p->dev_name));
169173
put_device(physdev);

0 commit comments

Comments
 (0)