diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 04:36:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 04:36:32 +0100 |
| commit | 593195f9b2309693f27b402f34573f7920b82c3e (patch) | |
| tree | 54d55557665e72e90ef35a1e0f008d381c17ed98 /drivers/media/dvb/ttpci/av7110.c | |
| parent | [PATCH] x86_64: Fix SMP bootup with CONFIG_KDUMP enabled (diff) | |
| parent | V4L/DVB (3354): VIDEO_SAA7134_ALSA shouldn't select SND_PCM_OSS (diff) | |
| download | linux-593195f9b2309693f27b402f34573f7920b82c3e.tar.xz linux-593195f9b2309693f27b402f34573f7920b82c3e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 8ce4146f55f1..327a8089193b 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c @@ -2565,14 +2565,12 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d } /* prepare the av7110 device struct */ - av7110 = kmalloc(sizeof(struct av7110), GFP_KERNEL); + av7110 = kzalloc(sizeof(struct av7110), GFP_KERNEL); if (!av7110) { dprintk(1, "out of memory\n"); return -ENOMEM; } - memset(av7110, 0, sizeof(struct av7110)); - av7110->card_name = (char*) pci_ext->ext_priv; av7110->dev = dev; dev->ext_priv = av7110; |