diff --git a/[refs] b/[refs]
index eece29eab753..a1a4b2df45e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 341068fcf8cc10145d38abe927fa9b9f0c461c66
+refs/heads/master: 899a179dbf5878fd01c0bd3b0e884ec526916afb
diff --git a/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c b/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c
index 716d4846f8bd..4597342cdfbe 100644
--- a/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c
+++ b/trunk/drivers/media/platform/s5p-tv/sii9234_drv.c
@@ -338,7 +338,7 @@ static int __devinit sii9234_probe(struct i2c_client *client,
 	}
 
 	ctx->gpio_n_reset = pdata->gpio_n_reset;
-	ret = gpio_request(ctx->gpio_n_reset, "MHL_RST");
+	ret = devm_gpio_request(dev, ctx->gpio_n_reset, "MHL_RST");
 	if (ret) {
 		dev_err(dev, "failed to acquire MHL_RST gpio\n");
 		return ret;
@@ -370,7 +370,6 @@ static int __devinit sii9234_probe(struct i2c_client *client,
 
 fail_pm:
 	pm_runtime_disable(dev);
-	gpio_free(ctx->gpio_n_reset);
 
 fail:
 	dev_err(dev, "probe failed\n");
@@ -381,11 +380,8 @@ static int __devinit sii9234_probe(struct i2c_client *client,
 static int __devexit sii9234_remove(struct i2c_client *client)
 {
 	struct device *dev = &client->dev;
-	struct v4l2_subdev *sd = i2c_get_clientdata(client);
-	struct sii9234_context *ctx = sd_to_context(sd);
 
 	pm_runtime_disable(dev);
-	gpio_free(ctx->gpio_n_reset);
 
 	dev_info(dev, "remove successful\n");