summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8903.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 10:59:32 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-03 10:59:32 +0000
commit2950cd2208174af9be430f6b6f1507d429c366ca (patch)
tree341f5faed1ad6a78861d315a576de3dc6b3e49b5 /sound/soc/codecs/wm8903.c
parent33e57f221a333efa55786f4c3610c7c82b358808 (diff)
downloadop-kernel-dev-2950cd2208174af9be430f6b6f1507d429c366ca.zip
op-kernel-dev-2950cd2208174af9be430f6b6f1507d429c366ca.tar.gz
ASoC: Convert WM8903 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Tested-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r--sound/soc/codecs/wm8903.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 60ad8cd..12eedaf 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -2079,7 +2079,8 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
struct wm8903_priv *wm8903;
int ret;
- wm8903 = kzalloc(sizeof(struct wm8903_priv), GFP_KERNEL);
+ wm8903 = devm_kzalloc(&i2c->dev, sizeof(struct wm8903_priv),
+ GFP_KERNEL);
if (wm8903 == NULL)
return -ENOMEM;
@@ -2088,15 +2089,13 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8903, &wm8903_dai, 1);
- if (ret < 0)
- kfree(wm8903);
+
return ret;
}
static __devexit int wm8903_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
- kfree(i2c_get_clientdata(client));
return 0;
}
OpenPOWER on IntegriCloud