aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/hexium_orion.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis@issaris.org>2006-01-11 16:40:56 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-11 16:40:56 -0500
commit7408187d223f63d46a13b6a35b8f96b032c2f623 (patch)
tree425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/hexium_orion.c
parent0b3af1b6df82cfdb54ae294ed860263011fa0408 (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/hexium_orion.c')
-rw-r--r--drivers/media/video/hexium_orion.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 42a9414155c3..0b6c2096ec66 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -224,12 +224,11 @@ static int hexium_probe(struct saa7146_dev *dev)
224 return -EFAULT; 224 return -EFAULT;
225 } 225 }
226 226
227 hexium = (struct hexium *) kmalloc(sizeof(struct hexium), GFP_KERNEL); 227 hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL);
228 if (NULL == hexium) { 228 if (NULL == hexium) {
229 printk("hexium_orion: hexium_probe: not enough kernel memory.\n"); 229 printk("hexium_orion: hexium_probe: not enough kernel memory.\n");
230 return -ENOMEM; 230 return -ENOMEM;
231 } 231 }
232 memset(hexium, 0x0, sizeof(struct hexium));
233 232
234 /* enable i2c-port pins */ 233 /* enable i2c-port pins */
235 saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 234 saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));