git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
sof
/
intel
/
byt.c
diff --git
a/sound/soc/sof/intel/byt.c
b/sound/soc/sof/intel/byt.c
index 4ed8381ecedaa9de4e3fff1a5ff3e857efa4c526..e6dc4ff531c3464c62fb0f9b4ead6cefe4c3ce42 100644
(file)
--- a/
sound/soc/sof/intel/byt.c
+++ b/
sound/soc/sof/intel/byt.c
@@
-465,10
+465,7
@@
static int sof_baytrail_probe(struct platform_device *pdev)
return -ENODEV;
}
- desc = device_get_match_data(&pdev->dev);
- if (!desc)
- return -ENODEV;
-
+ desc = (const struct sof_dev_desc *)id->driver_data;
if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev))
desc = &sof_acpi_baytrailcr_desc;