Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283849
b: refs/heads/master
c: 2950cd2
h: refs/heads/master
i:
  283847: 3754825
v: v3
  • Loading branch information
Mark Brown committed Dec 3, 2011
1 parent 5ac5813 commit 2d0ff04
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 33e57f221a333efa55786f4c3610c7c82b358808
refs/heads/master: 2950cd2208174af9be430f6b6f1507d429c366ca
7 changes: 3 additions & 4 deletions trunk/sound/soc/codecs/wm8903.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}

Expand Down

0 comments on commit 2d0ff04

Please sign in to comment.