X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;ds=sidebyside;f=sound%2Fsoc%2Fsof%2Fintel%2Fbyt.c;fp=sound%2Fsoc%2Fsof%2Fintel%2Fbyt.c;h=e6dc4ff531c3464c62fb0f9b4ead6cefe4c3ce42;hb=668c3c237f5ddc2889879b08f26d2374231f3287;hp=4ed8381ecedaa9de4e3fff1a5ff3e857efa4c526;hpb=f20c95b46b8fa3ad34b3ea2e134337f88591468b;p=sfrench%2Fcifs-2.6.git

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index 4ed8381eceda..e6dc4ff531c3 100644
--- 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;