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/video/saa7134/saa7134-video.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/video/saa7134/saa7134-video.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index adfa8fe49a11..e97426bc85df 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c @@ -1264,10 +1264,9 @@ static int video_open(struct inode *inode, struct file *file) v4l2_type_names[type]); /* allocate + initialize per filehandle data */ - fh = kmalloc(sizeof(*fh),GFP_KERNEL); + fh = kzalloc(sizeof(*fh),GFP_KERNEL); if (NULL == fh) return -ENOMEM; - memset(fh,0,sizeof(*fh)); file->private_data = fh; fh->dev = dev; fh->radio = radio; |