From c4eb1a8383c8e4b4d40cf040da21600595f8076d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 8 Dec 2011 10:55:22 +0800 Subject: [PATCH] --- yaml --- r: 284547 b: refs/heads/master c: 55ee29d5fff18b6485543bea10620daf9e29555c h: refs/heads/master i: 284545: 4ac9523a6886473fffaab512bc4b6d2056b1740c 284543: 8191fd38fb3272f7695968634ea87947bb8774ba v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm8350-i2c.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4f0d056b75c7..bff7073761ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18bf50a374a46aec83652f48006a6fac764c635d +refs/heads/master: 55ee29d5fff18b6485543bea10620daf9e29555c diff --git a/trunk/drivers/mfd/wm8350-i2c.c b/trunk/drivers/mfd/wm8350-i2c.c index 5fe5de166adb..d955faaf27c4 100644 --- a/trunk/drivers/mfd/wm8350-i2c.c +++ b/trunk/drivers/mfd/wm8350-i2c.c @@ -63,7 +63,7 @@ static int wm8350_i2c_probe(struct i2c_client *i2c, struct wm8350 *wm8350; int ret = 0; - wm8350 = kzalloc(sizeof(struct wm8350), GFP_KERNEL); + wm8350 = devm_kzalloc(&i2c->dev, sizeof(struct wm8350), GFP_KERNEL); if (wm8350 == NULL) return -ENOMEM; @@ -80,7 +80,6 @@ static int wm8350_i2c_probe(struct i2c_client *i2c, return ret; err: - kfree(wm8350); return ret; } @@ -89,7 +88,6 @@ static int wm8350_i2c_remove(struct i2c_client *i2c) struct wm8350 *wm8350 = i2c_get_clientdata(i2c); wm8350_device_exit(wm8350); - kfree(wm8350); return 0; }