diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-15 18:15:28 +0900 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-03-27 16:05:11 +0100 |
commit | b09638a4d6b8032f6569e6ec8a5cc373ced045aa (patch) | |
tree | 2304294f4f1056bfa679b7879eb92ec96d7e8f08 /drivers/gpio | |
parent | 4cb06cd58c23f6520dc00d67e62267ef17d69206 (diff) | |
download | talos-obmc-linux-b09638a4d6b8032f6569e6ec8a5cc373ced045aa.tar.gz talos-obmc-linux-b09638a4d6b8032f6569e6ec8a5cc373ced045aa.zip |
gpio: max732x: use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-max732x.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c index 1e0467ce4c37..d4b51b163b03 100644 --- a/drivers/gpio/gpio-max732x.c +++ b/drivers/gpio/gpio-max732x.c @@ -589,7 +589,8 @@ static int max732x_probe(struct i2c_client *client, return -EINVAL; } - chip = kzalloc(sizeof(struct max732x_chip), GFP_KERNEL); + chip = devm_kzalloc(&client->dev, sizeof(struct max732x_chip), + GFP_KERNEL); if (chip == NULL) return -ENOMEM; chip->client = client; @@ -647,7 +648,6 @@ static int max732x_probe(struct i2c_client *client, out_failed: max732x_irq_teardown(chip); - kfree(chip); return ret; } @@ -680,7 +680,6 @@ static int max732x_remove(struct i2c_client *client) if (chip->client_dummy) i2c_unregister_device(chip->client_dummy); - kfree(chip); return 0; } |