From a65cb13fb9144611db7e190685f9a47f7262c8e4 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 10 Aug 2012 07:53:46 -0300 Subject: [PATCH] --- yaml --- r: 330889 b: refs/heads/master c: 89e47e35685535c16a20dc7b9cf8f969024232bc h: refs/heads/master i: 330887: ebe30be3aae977c7c5fb43fd27f2810c055f2123 v: v3 --- [refs] | 2 +- .../drivers/media/platform/s5p-tv/sii9234_drv.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index baf7eabbff1a..f6a80644e54f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5c99037428b95da2ccc16daae6764b519ae0a90 +refs/heads/master: 89e47e35685535c16a20dc7b9cf8f969024232bc diff --git a/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c b/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c index 6d348f90237a..716d4846f8bd 100644 --- a/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c +++ b/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c @@ -323,7 +323,7 @@ static int __devinit sii9234_probe(struct i2c_client *client, struct sii9234_context *ctx; int ret; - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + ctx = devm_kzalloc(&client->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) { dev_err(dev, "out of memory\n"); ret = -ENOMEM; @@ -331,18 +331,17 @@ static int __devinit sii9234_probe(struct i2c_client *client, } ctx->client = client; - ctx->power = regulator_get(dev, "hdmi-en"); + ctx->power = devm_regulator_get(dev, "hdmi-en"); if (IS_ERR(ctx->power)) { dev_err(dev, "failed to acquire regulator hdmi-en\n"); - ret = PTR_ERR(ctx->power); - goto fail_ctx; + return PTR_ERR(ctx->power); } ctx->gpio_n_reset = pdata->gpio_n_reset; ret = gpio_request(ctx->gpio_n_reset, "MHL_RST"); if (ret) { dev_err(dev, "failed to acquire MHL_RST gpio\n"); - goto fail_power; + return ret; } v4l2_i2c_subdev_init(&ctx->sd, client, &sii9234_ops); @@ -373,12 +372,6 @@ static int __devinit sii9234_probe(struct i2c_client *client, pm_runtime_disable(dev); gpio_free(ctx->gpio_n_reset); -fail_power: - regulator_put(ctx->power); - -fail_ctx: - kfree(ctx); - fail: dev_err(dev, "probe failed\n"); @@ -393,8 +386,6 @@ static int __devexit sii9234_remove(struct i2c_client *client) pm_runtime_disable(dev); gpio_free(ctx->gpio_n_reset); - regulator_put(ctx->power); - kfree(ctx); dev_info(dev, "remove successful\n");