From 37580886e234057e7c7a6f1f605ffd913fab5658 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam@gentoo.org>
Date: Mon, 23 Feb 2009 12:26:38 -0300
Subject: [PATCH] --- yaml --- r: 137935 b: refs/heads/master c:
 8420fa7ee22c1d681549ff7ab0466ceda5a911c2 h: refs/heads/master i:   137933:
 1077cb0c523612f53df9f7ed95d69b837a0ba49e   137931:
 773b17f60432d7a33acdc16ce25c340383dd1a46   137927:
 6fadeae0904853d1d42665402cea040f0552b894   137919:
 27ce3896cbb58379ea038d25bcc1689673b26b18 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/dvb/frontends/cx24113.c     | 2 +-
 trunk/drivers/media/dvb/frontends/cx24116.c     | 5 +----
 trunk/drivers/media/dvb/frontends/cx24123.c     | 4 ++--
 trunk/drivers/media/dvb/frontends/lgdt3304.c    | 1 -
 trunk/drivers/media/dvb/frontends/s921_module.c | 1 -
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 786b32c07e7f..2fdc95dfa678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ca3bddf34bb6cdbdddd89f59fe3a0131d40eba
+refs/heads/master: 8420fa7ee22c1d681549ff7ab0466ceda5a911c2
diff --git a/trunk/drivers/media/dvb/frontends/cx24113.c b/trunk/drivers/media/dvb/frontends/cx24113.c
index f6e7b0380a5a..e4fd533a427c 100644
--- a/trunk/drivers/media/dvb/frontends/cx24113.c
+++ b/trunk/drivers/media/dvb/frontends/cx24113.c
@@ -559,7 +559,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
 		kzalloc(sizeof(struct cx24113_state), GFP_KERNEL);
 	int rc;
 	if (state == NULL) {
-		err("Unable to kmalloc\n");
+		err("Unable to kzalloc\n");
 		goto error;
 	}
 
diff --git a/trunk/drivers/media/dvb/frontends/cx24116.c b/trunk/drivers/media/dvb/frontends/cx24116.c
index ba1e24c82272..9b9f57264cef 100644
--- a/trunk/drivers/media/dvb/frontends/cx24116.c
+++ b/trunk/drivers/media/dvb/frontends/cx24116.c
@@ -1112,13 +1112,10 @@ struct dvb_frontend *cx24116_attach(const struct cx24116_config *config,
 	dprintk("%s\n", __func__);
 
 	/* allocate memory for the internal state */
-	state = kmalloc(sizeof(struct cx24116_state), GFP_KERNEL);
+	state = kzalloc(sizeof(struct cx24116_state), GFP_KERNEL);
 	if (state == NULL)
 		goto error1;
 
-	/* setup the state */
-	memset(state, 0, sizeof(struct cx24116_state));
-
 	state->config = config;
 	state->i2c = i2c;
 
diff --git a/trunk/drivers/media/dvb/frontends/cx24123.c b/trunk/drivers/media/dvb/frontends/cx24123.c
index 1a8c36f76061..0592f043ea64 100644
--- a/trunk/drivers/media/dvb/frontends/cx24123.c
+++ b/trunk/drivers/media/dvb/frontends/cx24123.c
@@ -1069,13 +1069,13 @@ static struct dvb_frontend_ops cx24123_ops;
 struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
 				    struct i2c_adapter *i2c)
 {
+	/* allocate memory for the internal state */
 	struct cx24123_state *state =
 		kzalloc(sizeof(struct cx24123_state), GFP_KERNEL);
 
 	dprintk("\n");
-	/* allocate memory for the internal state */
 	if (state == NULL) {
-		err("Unable to kmalloc\n");
+		err("Unable to kzalloc\n");
 		goto error;
 	}
 
diff --git a/trunk/drivers/media/dvb/frontends/lgdt3304.c b/trunk/drivers/media/dvb/frontends/lgdt3304.c
index 3bb0c4394f8a..eb72a9866c93 100644
--- a/trunk/drivers/media/dvb/frontends/lgdt3304.c
+++ b/trunk/drivers/media/dvb/frontends/lgdt3304.c
@@ -363,7 +363,6 @@ struct dvb_frontend* lgdt3304_attach(const struct lgdt3304_config *config,
 
 	struct lgdt3304_state *state;
 	state = kzalloc(sizeof(struct lgdt3304_state), GFP_KERNEL);
-	memset(state, 0x0, sizeof(struct lgdt3304_state));
 	state->addr = config->i2c_address;
 	state->i2c = i2c;
 
diff --git a/trunk/drivers/media/dvb/frontends/s921_module.c b/trunk/drivers/media/dvb/frontends/s921_module.c
index 892af8c9ed57..3f5a0e1dfdf5 100644
--- a/trunk/drivers/media/dvb/frontends/s921_module.c
+++ b/trunk/drivers/media/dvb/frontends/s921_module.c
@@ -169,7 +169,6 @@ struct dvb_frontend* s921_attach(const struct s921_config *config,
 
 	struct s921_state *state;
 	state = kzalloc(sizeof(struct s921_state), GFP_KERNEL);
-	memset(state, 0x0, sizeof(struct s921_state));
 
 	state->addr = config->i2c_address;
 	state->i2c = i2c;