|
@@ -2531,7 +2531,8 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
|
|
|
struct wm8904_priv *wm8904;
|
|
|
int ret;
|
|
|
|
|
|
- wm8904 = kzalloc(sizeof(struct wm8904_priv), GFP_KERNEL);
|
|
|
+ wm8904 = devm_kzalloc(&i2c->dev, sizeof(struct wm8904_priv),
|
|
|
+ GFP_KERNEL);
|
|
|
if (wm8904 == NULL)
|
|
|
return -ENOMEM;
|
|
|
|
|
@@ -2541,15 +2542,13 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,
|
|
|
|
|
|
ret = snd_soc_register_codec(&i2c->dev,
|
|
|
&soc_codec_dev_wm8904, &wm8904_dai, 1);
|
|
|
- if (ret < 0)
|
|
|
- kfree(wm8904);
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
static __devexit int wm8904_i2c_remove(struct i2c_client *client)
|
|
|
{
|
|
|
snd_soc_unregister_codec(&client->dev);
|
|
|
- kfree(i2c_get_clientdata(client));
|
|
|
return 0;
|
|
|
}
|
|
|
|