diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-01-11 16:40:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 16:40:56 -0500 |
commit | 7408187d223f63d46a13b6a35b8f96b032c2f623 (patch) | |
tree | 425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/saa7134/saa7134-video.c | |
parent | 0b3af1b6df82cfdb54ae294ed860263011fa0408 (diff) |
V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to k(z|c)alloc.
Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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) | |||
1264 | v4l2_type_names[type]); | 1264 | v4l2_type_names[type]); |
1265 | 1265 | ||
1266 | /* allocate + initialize per filehandle data */ | 1266 | /* allocate + initialize per filehandle data */ |
1267 | fh = kmalloc(sizeof(*fh),GFP_KERNEL); | 1267 | fh = kzalloc(sizeof(*fh),GFP_KERNEL); |
1268 | if (NULL == fh) | 1268 | if (NULL == fh) |
1269 | return -ENOMEM; | 1269 | return -ENOMEM; |
1270 | memset(fh,0,sizeof(*fh)); | ||
1271 | file->private_data = fh; | 1270 | file->private_data = fh; |
1272 | fh->dev = dev; | 1271 | fh->dev = dev; |
1273 | fh->radio = radio; | 1272 | fh->radio = radio; |