From 9cf36fbad9c60e0809dae68ee643a0d3e2896ed2 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Wed, 12 Sep 2012 08:55:57 -0300
Subject: [PATCH] --- yaml --- r: 333830 b: refs/heads/master c:
 6f0fdc498e30ce34da559f43e359c4b517cb5b8b h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/tuners/mt2063.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 79c963764cc1..bdec59960096 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ae13e9e673786985b6910d5a051bc7cea038ea6
+refs/heads/master: 6f0fdc498e30ce34da559f43e359c4b517cb5b8b
diff --git a/trunk/drivers/media/tuners/mt2063.c b/trunk/drivers/media/tuners/mt2063.c
index 0ed9091ff48e..620c4fad7181 100644
--- a/trunk/drivers/media/tuners/mt2063.c
+++ b/trunk/drivers/media/tuners/mt2063.c
@@ -2249,8 +2249,8 @@ struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
 	dprintk(2, "\n");
 
 	state = kzalloc(sizeof(struct mt2063_state), GFP_KERNEL);
-	if (state == NULL)
-		goto error;
+	if (!state)
+		return NULL;
 
 	state->config = config;
 	state->i2c = i2c;
@@ -2261,10 +2261,6 @@ struct dvb_frontend *mt2063_attach(struct dvb_frontend *fe,
 
 	printk(KERN_INFO "%s: Attaching MT2063\n", __func__);
 	return fe;
-
-error:
-	kfree(state);
-	return NULL;
 }
 EXPORT_SYMBOL_GPL(mt2063_attach);