Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / intel / catpt / device.c

diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c
index 85a34e37316d0aa9467aee95146b4894d943bc78..d48a71d2cf1ecaeb043d8224794c631ebec01ee3 100644 (file)
--- a/sound/soc/intel/catpt/device.c
+++ b/sound/soc/intel/catpt/device.c
@@ -254,14 +254,11 @@ static int catpt_acpi_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       spec = device_get_match_data(dev);
-       if (!spec)
-               return -ENODEV;
-
        cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL);
        if (!cdev)
                return -ENOMEM;
 
+       spec = (const struct catpt_spec *)id->driver_data;
        catpt_dev_init(cdev, dev, spec);
 
        /* map DSP bar address */