diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-26 07:58:14 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-27 07:58:02 -0500 |
commit | 6ce91ad4d8d7370be4f9ca3d7ded866cb1e2430d (patch) | |
tree | e62b64eacea8b9998fcde8b1de70f412b59b9850 /sound/soc/codecs/uda1380.c | |
parent | eb3bb97ce73ac666d9c3d16fc250fa0b78e3b8f2 (diff) |
ASoC: Convert uda1380 to devm_kzalloc()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/uda1380.c')
-rw-r--r-- | sound/soc/codecs/uda1380.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 8f734d69f651..4f1b23d7e404 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c | |||
@@ -803,7 +803,8 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, | |||
803 | struct uda1380_priv *uda1380; | 803 | struct uda1380_priv *uda1380; |
804 | int ret; | 804 | int ret; |
805 | 805 | ||
806 | uda1380 = kzalloc(sizeof(struct uda1380_priv), GFP_KERNEL); | 806 | uda1380 = devm_kzalloc(&i2c->dev, sizeof(struct uda1380_priv), |
807 | GFP_KERNEL); | ||
807 | if (uda1380 == NULL) | 808 | if (uda1380 == NULL) |
808 | return -ENOMEM; | 809 | return -ENOMEM; |
809 | 810 | ||
@@ -812,15 +813,12 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, | |||
812 | 813 | ||
813 | ret = snd_soc_register_codec(&i2c->dev, | 814 | ret = snd_soc_register_codec(&i2c->dev, |
814 | &soc_codec_dev_uda1380, uda1380_dai, ARRAY_SIZE(uda1380_dai)); | 815 | &soc_codec_dev_uda1380, uda1380_dai, ARRAY_SIZE(uda1380_dai)); |
815 | if (ret < 0) | ||
816 | kfree(uda1380); | ||
817 | return ret; | 816 | return ret; |
818 | } | 817 | } |
819 | 818 | ||
820 | static int __devexit uda1380_i2c_remove(struct i2c_client *i2c) | 819 | static int __devexit uda1380_i2c_remove(struct i2c_client *i2c) |
821 | { | 820 | { |
822 | snd_soc_unregister_codec(&i2c->dev); | 821 | snd_soc_unregister_codec(&i2c->dev); |
823 | kfree(i2c_get_clientdata(i2c)); | ||
824 | return 0; | 822 | return 0; |
825 | } | 823 | } |
826 | 824 | ||