Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / codecs / sti-sas.c

diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c
index 160d61a66204b25db880c0e7eb7618344026e81e..7b31ee9b82bc87beb493427049fc82d75e1127e8 100644 (file)
--- a/sound/soc/codecs/sti-sas.c
+++ b/sound/soc/codecs/sti-sas.c
@@ -591,11 +591,11 @@ static int sti_sas_driver_probe(struct platform_device *pdev)
        sti_sas_dai[STI_SAS_DAI_ANALOG_OUT].ops = drvdata->dev_data->dac_ops;
 
        /* Set dapms*/
-       sti_sas_driver.dapm_widgets = drvdata->dev_data->dapm_widgets;
-       sti_sas_driver.num_dapm_widgets = drvdata->dev_data->num_dapm_widgets;
+       sti_sas_driver.component_driver.dapm_widgets = drvdata->dev_data->dapm_widgets;
+       sti_sas_driver.component_driver.num_dapm_widgets = drvdata->dev_data->num_dapm_widgets;
 
-       sti_sas_driver.dapm_routes = drvdata->dev_data->dapm_routes;
-       sti_sas_driver.num_dapm_routes = drvdata->dev_data->num_dapm_routes;
+       sti_sas_driver.component_driver.dapm_routes = drvdata->dev_data->dapm_routes;
+       sti_sas_driver.component_driver.num_dapm_routes = drvdata->dev_data->num_dapm_routes;
 
        /* Store context */
        dev_set_drvdata(&pdev->dev, drvdata);