Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm

Conflicts:
	sound/soc/fsl/imx-sgtl5000.c

diff --cc sound/soc/fsl/imx-sgtl5000.c
index 78f86d8,ca1be1d..6f4bdc8
--- 1/sound/soc/fsl/imx-sgtl5000.c
--- 2/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@@ -180,6 -182,16 +182,15 @@@ fail
        return ret;
  }
  
 -      snd_soc_unregister_card(&data->card);
+ static int imx_sgtl5000_remove(struct platform_device *pdev)
+ {
+       struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
+ 
+       clk_put(data->codec_clk);
+ 
+       return 0;
+ }
+ 
  static const struct of_device_id imx_sgtl5000_dt_ids[] = {
        { .compatible = "fsl,imx-audio-sgtl5000", },
        { /* sentinel */ }