From: Mark Brown <broonie@linaro.org>
Date: Thu, 26 Sep 2013 11:05:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/fsl' into asoc-devm
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e8f00c1b01c8b547bd1e11754634ce1913c7cc72;p=deliverable%2Flinux.git

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

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

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