aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/mt352.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 22:36:32 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 22:36:32 -0500
commit593195f9b2309693f27b402f34573f7920b82c3e (patch)
tree54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/dvb/frontends/mt352.c
parent983d5dbdb2b38d024935f560a91cddcf704875f3 (diff)
parentf9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/dvb/frontends/mt352.c')
-rw-r--r--drivers/media/dvb/frontends/mt352.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index f0c610f2c2df..aaaec909ddf8 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -535,9 +535,8 @@ struct dvb_frontend* mt352_attach(const struct mt352_config* config,
535 struct mt352_state* state = NULL; 535 struct mt352_state* state = NULL;
536 536
537 /* allocate memory for the internal state */ 537 /* allocate memory for the internal state */
538 state = kmalloc(sizeof(struct mt352_state), GFP_KERNEL); 538 state = kzalloc(sizeof(struct mt352_state), GFP_KERNEL);
539 if (state == NULL) goto error; 539 if (state == NULL) goto error;
540 memset(state,0,sizeof(*state));
541 540
542 /* setup the state */ 541 /* setup the state */
543 state->i2c = i2c; 542 state->i2c = i2c;