From fc33b4e21213bfe3b89f7bee7077c4ea88d85186 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 19 Jan 2011 11:27:58 -0300
Subject: [PATCH] --- yaml --- r: 241983 b: refs/heads/master c:
 ed54c0e33c6ac72c681f00a41b47840f6570262c h: refs/heads/master i:   241981:
 0fe55ba2ace8eed1a1c36038dea7fee6d6a2d77e   241979:
 396a26256bc714548bc6104d65528eba54b40525   241975:
 e52b7c2ccaa1bb944ded963f85a834af354dde08   241967:
 ee40abc6f7c7ccc3ec215f0cf80b54e8be2af324   241951:
 6e76c0677389ae240d7511969e24ab777e58e27c   241919:
 ef5b642b7d600088dd0cb81016fd9df9295e312f v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/dvb/frontends/dib8000.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0c7634dc71f3..76dc796aa0a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40285f832b09feb621d8da9db7983200a4b29311
+refs/heads/master: ed54c0e33c6ac72c681f00a41b47840f6570262c
diff --git a/trunk/drivers/media/dvb/frontends/dib8000.c b/trunk/drivers/media/dvb/frontends/dib8000.c
index 3e20aa8db23b..c1c3e26906e2 100644
--- a/trunk/drivers/media/dvb/frontends/dib8000.c
+++ b/trunk/drivers/media/dvb/frontends/dib8000.c
@@ -2514,7 +2514,7 @@ struct dvb_frontend *dib8000_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, s
 		return NULL;
 	fe = kzalloc(sizeof(struct dvb_frontend), GFP_KERNEL);
 	if (fe == NULL)
-		return NULL;
+		goto error;
 
 	memcpy(&state->cfg, cfg, sizeof(struct dib8000_config));
 	state->i2c.adap = i2c_adap;