aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8990.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
-rw-r--r--sound/soc/codecs/wm8990.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index 831f4730bfd5..7b536d923ea9 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -1012,7 +1012,7 @@ static int wm8990_set_dai_sysclk(struct snd_soc_dai *codec_dai,
1012 int clk_id, unsigned int freq, int dir) 1012 int clk_id, unsigned int freq, int dir)
1013{ 1013{
1014 struct snd_soc_codec *codec = codec_dai->codec; 1014 struct snd_soc_codec *codec = codec_dai->codec;
1015 struct wm8990_priv *wm8990 = codec->private_data; 1015 struct wm8990_priv *wm8990 = snd_soc_codec_get_drvdata(codec);
1016 1016
1017 wm8990->sysclk = freq; 1017 wm8990->sysclk = freq;
1018 return 0; 1018 return 0;
@@ -1524,7 +1524,7 @@ static int wm8990_probe(struct platform_device *pdev)
1524 return -ENOMEM; 1524 return -ENOMEM;
1525 } 1525 }
1526 1526
1527 codec->private_data = wm8990; 1527 snd_soc_codec_set_drvdata(codec, wm8990);
1528 socdev->card->codec = codec; 1528 socdev->card->codec = codec;
1529 mutex_init(&codec->mutex); 1529 mutex_init(&codec->mutex);
1530 INIT_LIST_HEAD(&codec->dapm_widgets); 1530 INIT_LIST_HEAD(&codec->dapm_widgets);
@@ -1541,7 +1541,7 @@ static int wm8990_probe(struct platform_device *pdev)
1541#endif 1541#endif
1542 1542
1543 if (ret != 0) { 1543 if (ret != 0) {
1544 kfree(codec->private_data); 1544 kfree(snd_soc_codec_get_drvdata(codec));
1545 kfree(codec); 1545 kfree(codec);
1546 } 1546 }
1547 return ret; 1547 return ret;
@@ -1561,7 +1561,7 @@ static int wm8990_remove(struct platform_device *pdev)
1561 i2c_unregister_device(codec->control_data); 1561 i2c_unregister_device(codec->control_data);
1562 i2c_del_driver(&wm8990_i2c_driver); 1562 i2c_del_driver(&wm8990_i2c_driver);
1563#endif 1563#endif
1564 kfree(codec->private_data); 1564 kfree(snd_soc_codec_get_drvdata(codec));
1565 kfree(codec); 1565 kfree(codec);
1566 1566
1567 return 0; 1567 return 0;