Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic...

[mirror_ubuntu-zesty-kernel.git] / sound / soc / fsl / fsl-asoc-card.c

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 33628a09fcf5121a730ecda8030fd9d75a61788e..1b05d1c5d9fd50fe32eb9b65f4da1340db9170e5 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -539,7 +539,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
                priv->dai_fmt = SND_SOC_DAIFMT_AC97;
        } else {
                dev_err(&pdev->dev, "unknown Device Tree compatible\n");
-               return -EINVAL;
+               ret = -EINVAL;
+               goto asrc_fail;
        }
 
        if (!fsl_asoc_card_is_ac97(priv) && !codec_dev) {
@@ -672,6 +673,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = {
        { .compatible = "fsl,imx-audio-wm8960", },
        {}
 };
+MODULE_DEVICE_TABLE(of, fsl_asoc_card_dt_ids);
 
 static struct platform_driver fsl_asoc_card_driver = {
        .probe = fsl_asoc_card_probe,