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/em28xx | |
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/em28xx')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index fdc255918dde..3323dffe26a4 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1861,12 +1861,11 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
1861 | } | 1861 | } |
1862 | 1862 | ||
1863 | /* allocate memory for our device state and initialize it */ | 1863 | /* allocate memory for our device state and initialize it */ |
1864 | dev = kmalloc(sizeof(*dev), GFP_KERNEL); | 1864 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
1865 | if (dev == NULL) { | 1865 | if (dev == NULL) { |
1866 | em28xx_err(DRIVER_NAME ": out of memory!\n"); | 1866 | em28xx_err(DRIVER_NAME ": out of memory!\n"); |
1867 | return -ENOMEM; | 1867 | return -ENOMEM; |
1868 | } | 1868 | } |
1869 | memset(dev, 0, sizeof(*dev)); | ||
1870 | 1869 | ||
1871 | /* compute alternate max packet sizes */ | 1870 | /* compute alternate max packet sizes */ |
1872 | uif = udev->actconfig->interface[0]; | 1871 | uif = udev->actconfig->interface[0]; |