diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:36:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:36:32 -0800 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/dvb/bt8xx/dvb-bt8xx.c | |
| parent | 983d5dbdb2b38d024935f560a91cddcf704875f3 (diff) | |
| parent | f9cfc08d640e1586e76eee63cc2b0a9360bc7c7e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/dvb/bt8xx/dvb-bt8xx.c')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 01b4e0aac04..f65f64b00ff 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -786,10 +786,9 @@ static int dvb_bt8xx_probe(struct device *dev) struct pci_dev* bttv_pci_dev; int ret; - if (!(card = kmalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL))) + if (!(card = kzalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL))) return -ENOMEM; - memset(card, 0, sizeof(*card)); init_MUTEX(&card->lock); card->bttv_nr = sub->core->nr; strncpy(card->card_name, sub->core->name, sizeof(sub->core->name)); |