|
@@ -1087,7 +1087,8 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
|
|
|
struct wm8961_priv *wm8961;
|
|
|
int ret;
|
|
|
|
|
|
- wm8961 = kzalloc(sizeof(struct wm8961_priv), GFP_KERNEL);
|
|
|
+ wm8961 = devm_kzalloc(&i2c->dev, sizeof(struct wm8961_priv),
|
|
|
+ GFP_KERNEL);
|
|
|
if (wm8961 == NULL)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -1095,15 +1096,14 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c,
|
|
|
|
|
|
ret = snd_soc_register_codec(&i2c->dev,
|
|
|
&soc_codec_dev_wm8961, &wm8961_dai, 1);
|
|
|
- if (ret < 0)
|
|
|
- kfree(wm8961);
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
static __devexit int wm8961_i2c_remove(struct i2c_client *client)
|
|
|
{
|
|
|
snd_soc_unregister_codec(&client->dev);
|
|
|
- kfree(i2c_get_clientdata(client));
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|