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/dvb/ttpci | |
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/dvb/ttpci')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-av.c | 4 |
2 files changed, 2 insertions, 6 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 | |||
2565 | } | 2565 | } |
2566 | 2566 | ||
2567 | /* prepare the av7110 device struct */ | 2567 | /* prepare the av7110 device struct */ |
2568 | av7110 = kmalloc(sizeof(struct av7110), GFP_KERNEL); | 2568 | av7110 = kzalloc(sizeof(struct av7110), GFP_KERNEL); |
2569 | if (!av7110) { | 2569 | if (!av7110) { |
2570 | dprintk(1, "out of memory\n"); | 2570 | dprintk(1, "out of memory\n"); |
2571 | return -ENOMEM; | 2571 | return -ENOMEM; |
2572 | } | 2572 | } |
2573 | 2573 | ||
2574 | memset(av7110, 0, sizeof(struct av7110)); | ||
2575 | |||
2576 | av7110->card_name = (char*) pci_ext->ext_priv; | 2574 | av7110->card_name = (char*) pci_ext->ext_priv; |
2577 | av7110->dev = dev; | 2575 | av7110->dev = dev; |
2578 | dev->ext_priv = av7110; | 2576 | dev->ext_priv = av7110; |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index f9d00452e639..aa2645895769 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -1027,11 +1027,9 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio | |||
1027 | 1027 | ||
1028 | dprintk(2, "dev: %p\n", dev); | 1028 | dprintk(2, "dev: %p\n", dev); |
1029 | 1029 | ||
1030 | if (!(budget_av = kmalloc(sizeof(struct budget_av), GFP_KERNEL))) | 1030 | if (!(budget_av = kzalloc(sizeof(struct budget_av), GFP_KERNEL))) |
1031 | return -ENOMEM; | 1031 | return -ENOMEM; |
1032 | 1032 | ||
1033 | memset(budget_av, 0, sizeof(struct budget_av)); | ||
1034 | |||
1035 | budget_av->has_saa7113 = 0; | 1033 | budget_av->has_saa7113 = 0; |
1036 | budget_av->budget.ci_present = 0; | 1034 | budget_av->budget.ci_present = 0; |
1037 | 1035 | ||