diff options
author | Patrick Boettcher <pboettcher@kernellabs.com> | 2009-08-17 09:34:41 +0200 |
---|---|---|
committer | Patrick Boettcher <pboettcher@kernellabs.com> | 2009-08-17 09:34:41 +0200 |
commit | 0dc1c1447192743fcb90d7e51d3e5fab897b5388 (patch) | |
tree | e2855561db510382fb736bdc8ebe5f15af4e816b /linux/drivers/media/dvb/frontends/tda1004x.c | |
parent | beae3fdb4940243ca65c75fea541535237e8e280 (diff) | |
parent | d0e71c5a86eeb98ca96d280c22b030e9877c3520 (diff) | |
download | mediapointer-dvb-s2-0dc1c1447192743fcb90d7e51d3e5fab897b5388.tar.gz mediapointer-dvb-s2-0dc1c1447192743fcb90d7e51d3e5fab897b5388.tar.bz2 |
merge: from main
From: Patrick Boettcher <pboettcher@kernellabs.com>
merge: from main
Priority: normal
Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/tda1004x.c')
-rw-r--r-- | linux/drivers/media/dvb/frontends/tda1004x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/tda1004x.c b/linux/drivers/media/dvb/frontends/tda1004x.c index 4981cef8b..f2a8abe0a 100644 --- a/linux/drivers/media/dvb/frontends/tda1004x.c +++ b/linux/drivers/media/dvb/frontends/tda1004x.c @@ -1269,7 +1269,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config, int id; /* allocate memory for the internal state */ - state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL); + state = kzalloc(sizeof(struct tda1004x_state), GFP_KERNEL); if (!state) { printk(KERN_ERR "Can't alocate memory for tda10045 state\n"); return NULL; @@ -1339,7 +1339,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config, int id; /* allocate memory for the internal state */ - state = kmalloc(sizeof(struct tda1004x_state), GFP_KERNEL); + state = kzalloc(sizeof(struct tda1004x_state), GFP_KERNEL); if (!state) { printk(KERN_ERR "Can't alocate memory for tda10046 state\n"); return NULL; |